diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index d9d916d9079..141b2d81594 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -641,6 +641,10 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
                     }
                 }
 
+                if (this instanceof GoClientExperimentalCodegen && model.isEnum) {
+                    imports.add(createMapping("import", "fmt"));
+                }
+
                 // if oneOf contains "null" type
                 if (model.oneOf != null && !model.oneOf.isEmpty() && model.oneOf.contains("nil")) {
                     model.isNullable = true;
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache
index 11b14661a69..b742b3e2147 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_enum.mustache
@@ -1,7 +1,3 @@
-import (
-	"fmt"
-)
-
 // {{{classname}}} {{#description}}{{{.}}}{{/description}}{{^description}}the model '{{{classname}}}'{{/description}}
 type {{{classname}}} {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{/format}}
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
index 4d8ea8b432c..8d68d80f50a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go b/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
index c8d6f9b2c23..009d021b853 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go
index 10e6a93c566..97094c05ce8 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_class.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go
index a128f15d2e3..35561af59cb 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go
index 929b5b24d06..fe33ab9e7cf 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_default_value.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go
index d88ca7f2e32..d1f5a80197d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )
 
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go
index 184e2e996fd..9e785ac967d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_enum_integer_default_value.go
@@ -11,9 +11,6 @@ package petstore
 
 import (
 	"encoding/json"
-)
-
-import (
 	"fmt"
 )