diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache
index 0fc6145c091a..8c436c764dbb 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache
@@ -52,7 +52,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlin.collections.List
 import kotlin.collections.Map
 
+{{^useFeignClient}}
 @RestController
+{{/useFeignClient}}
 {{#useBeanValidation}}
 @Validated
 {{/useBeanValidation}}
diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt
index 6705a7ed3910..e071fced838b 100644
--- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt
+++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt
@@ -29,7 +29,6 @@ import javax.validation.Valid
 import kotlin.collections.List
 import kotlin.collections.Map
 
-@RestController
 @Validated
 interface PetApi {
 
diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt
index 2b2ee09cfd1d..8ed65fbda036 100644
--- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt
+++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/StoreApi.kt
@@ -28,7 +28,6 @@ import javax.validation.Valid
 import kotlin.collections.List
 import kotlin.collections.Map
 
-@RestController
 @Validated
 interface StoreApi {
 
diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt
index 05de414f03d6..8318edda4fd4 100644
--- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt
+++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt
@@ -28,7 +28,6 @@ import javax.validation.Valid
 import kotlin.collections.List
 import kotlin.collections.Map
 
-@RestController
 @Validated
 interface UserApi {