diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
index b34e4f63e7ac..c977cbf355d2 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache
@@ -25,7 +25,9 @@ import {{jacksonPackage}}.databind.annotation.JsonDeserialize;
 import {{jacksonPackage}}.databind.annotation.JsonSerialize;
 import {{jacksonPackage}}.databind.deser.std.StdDeserializer;
 import {{jacksonPackage}}.databind.ser.std.StdSerializer;
+{{#supportUrlQuery}}
 import {{invokerPackage}}.ApiClient;
+{{/supportUrlQuery}}
 import {{invokerPackage}}.JSON;
 
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
index 2b28229f94d9..1ecfc5679a64 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache
@@ -27,7 +27,9 @@ import {{jacksonPackage}}.databind.annotation.JsonDeserialize;
 import {{jacksonPackage}}.databind.annotation.JsonSerialize;
 import {{jacksonPackage}}.databind.deser.std.StdDeserializer;
 import {{jacksonPackage}}.databind.ser.std.StdSerializer;
+{{#supportUrlQuery}}
 import {{invokerPackage}}.ApiClient;
+{{/supportUrlQuery}}
 import {{invokerPackage}}.JSON;
 
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>xmlAnnotation}}