diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache
index c0a697e40b4..4a1ab1dc77b 100644
--- a/modules/swagger-codegen/src/main/resources/Java/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache
@@ -58,7 +58,7 @@ public class {{classname}} {
     Map<String, String> headerParams = new HashMap<String, String>();
     Map<String, String> formParams = new HashMap<String, String>();
 
-    {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
+    {{#queryParams}}if ({{paramName}} != null)
       queryParams.put("{{baseName}}", String.valueOf({{paramName}}));
     {{/queryParams}}
     {{#headerParams}}headerParams.put("{{baseName}}", {{paramName}});