diff --git a/src/main/java/com/spotify/docker/client/messages/swarm/SwarmInit.java b/src/main/java/com/spotify/docker/client/messages/swarm/SwarmInit.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/spotify/docker/client/messages/swarm/SwarmInit.java
+++ b/src/main/java/com/spotify/docker/client/messages/swarm/SwarmInit.java
@@ -71,16 +71,11 @@ public abstract class SwarmInit {
       @JsonProperty("AdvertiseAddr") final String advertiseAddr,
       @JsonProperty("ForceNewCluster") final Boolean forceNewCluster,
       @JsonProperty("Spec") final SwarmSpec swarmSpec) {
-    final Builder builder = builder()
+    return builder()
         .listenAddr(listenAddr)
         .advertiseAddr(advertiseAddr)
-        .forceNewCluster(forceNewCluster);
-
-    if (swarmSpec != null) {
-      builder.swarmSpec(swarmSpec);
-    }
-
-    return builder.build();
-
+        .forceNewCluster(forceNewCluster)
+        .swarmSpec(swarmSpec)
+        .build();
   }
 }
Remove unnecessary null checks for nullables in SwarmInit