diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
index 888f407a412..9392277b52c 100644
--- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
@@ -247,7 +247,12 @@ public class ApiClient {
     Set<Pair> params = new HashSet<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
+    if (name == null || name.isEmpty()) return params;
+
+    if (value == null) {
+      params.add(new Pair(name, value));
+      return params;
+    }
 
     Collection<String> valueCollection = null;
     if (value instanceof Collection) {
diff --git a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
index 55d85018500..61baf88e8ea 100644
--- a/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
@@ -141,7 +141,12 @@ public class ApiInvoker {
     Set<Pair> params = new HashSet<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
+    if (name == null || name.isEmpty()) return params;
+
+    if (value == null) {
+      params.add(new Pair(name, value));
+      return params;
+    }
 
     Collection<String> valueCollection = null;
     if (value instanceof Collection) {
diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
index f148a6fcbb7..73dc1ddc65b 100644
--- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -141,7 +141,12 @@ public class ApiInvoker {
     Set<Pair> params = new HashSet<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
+    if (name == null || name.isEmpty()) return params;
+
+    if (value == null) {
+      params.add(new Pair(name, value));
+      return params;
+    }
 
     Collection<String> valueCollection = null;
     if (value instanceof Collection) {
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
index 441e5cc1f3c..cd801e0d763 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
@@ -246,7 +246,12 @@ public class ApiClient {
     Set<Pair> params = new HashSet<Pair>();
 
     // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
+    if (name == null || name.isEmpty()) return params;
+
+    if (value == null) {
+      params.add(new Pair(name, value));
+      return params;
+    }
 
     Collection<String> valueCollection = null;
     if (value instanceof Collection) {