diff --git a/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java b/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java
index 701bef6a77..1e35e8a334 100644
--- a/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java
+++ b/modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java
@@ -890,7 +890,9 @@ public Parameter convert(io.swagger.models.parameters.Parameter v2Parameter) {
         if (StringUtils.isNotBlank(v2Parameter.getDescription())) {
             v3Parameter.setDescription(v2Parameter.getDescription());
         }
-        v3Parameter.setAllowEmptyValue(v2Parameter.getAllowEmptyValue());
+        if (v2Parameter instanceof SerializableParameter) {
+            v3Parameter.setAllowEmptyValue(((SerializableParameter)v2Parameter).getAllowEmptyValue());
+        }
         v3Parameter.setIn(v2Parameter.getIn());
         v3Parameter.setName(v2Parameter.getName());
 
diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
index f99afa3555..50f8f54e47 100644
--- a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
+++ b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
@@ -1320,9 +1320,11 @@ public Parameter getParameter(ObjectNode obj, String location, ParseResult resul
             parameter.setDeprecated(deprecated);
         }
 
-        Boolean allowEmptyValue = getBoolean("allowEmptyValue", obj, false, location, result);
-        if (allowEmptyValue != null) {
-            parameter.setAllowEmptyValue(allowEmptyValue);
+        if (parameter instanceof QueryParameter) {
+            Boolean allowEmptyValue = getBoolean("allowEmptyValue", obj, false, location, result);
+            if (allowEmptyValue != null) {
+                parameter.setAllowEmptyValue(allowEmptyValue);
+            }
         }
 
         value = getString("style", obj, false, location, result);
@@ -1433,11 +1435,6 @@ public Header getHeader(ObjectNode headerNode, String location, ParseResult resu
             header.setDeprecated(deprecated);
         }
 
-        Boolean allowEmptyValue = getBoolean("allowEmptyValue", headerNode, false, location, result);
-        if (allowEmptyValue != null) {
-            header.setAllowEmptyValue(allowEmptyValue);
-        }
-
         Boolean explode = getBoolean("explode", headerNode, false, location, result);
         if (explode != null) {
             header.setExplode(explode);