diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
index be7242f8c9d..5237520ce9d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -685,7 +685,7 @@ public class SpringCodegen extends AbstractJavaCodegen
     public void preprocessOpenAPI(OpenAPI openAPI) {
         super.preprocessOpenAPI(openAPI);
 
-        if (!interfaceOnly && SPRING_BOOT.equals(library) && containsEnums()) {
+        if (SPRING_BOOT.equals(library) && containsEnums()) {
             supportingFiles.add(new SupportingFile("converter.mustache",
                     (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "EnumConverterConfiguration.java"));
         }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
index eb1a4d69db4..9e5176487bf 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
@@ -7,6 +7,7 @@ src/main/java/org/openapitools/api/FakeClassnameTestApi.java
 src/main/java/org/openapitools/api/PetApi.java
 src/main/java/org/openapitools/api/StoreApi.java
 src/main/java/org/openapitools/api/UserApi.java
+src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
 src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
 src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
 src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
new file mode 100644
index 00000000000..b257cf0a16c
--- /dev/null
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/configuration/EnumConverterConfiguration.java
@@ -0,0 +1,32 @@
+package org.openapitools.configuration;
+
+import org.openapitools.model.EnumClass;
+import org.openapitools.model.OuterEnum;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+@Configuration
+public class EnumConverterConfiguration {
+
+    @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.enumClassConverter")
+    Converter<String, EnumClass> enumClassConverter() {
+        return new Converter<String, EnumClass>() {
+            @Override
+            public EnumClass convert(String source) {
+                return EnumClass.fromValue(source);
+            }
+        };
+    }
+    @Bean(name = "org.openapitools.configuration.EnumConverterConfiguration.outerEnumConverter")
+    Converter<String, OuterEnum> outerEnumConverter() {
+        return new Converter<String, OuterEnum>() {
+            @Override
+            public OuterEnum convert(String source) {
+                return OuterEnum.fromValue(source);
+            }
+        };
+    }
+
+}