diff --git a/modules/openapi-generator/src/main/resources/typescript-nestjs/api.module.mustache b/modules/openapi-generator/src/main/resources/typescript-nestjs/api.module.mustache
index 0226f69fb1f..120cae581c0 100644
--- a/modules/openapi-generator/src/main/resources/typescript-nestjs/api.module.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-nestjs/api.module.mustache
@@ -11,13 +11,13 @@ import { {{classname}} } from './{{importPath}}';
 @Global
 @Module({
   imports:      [ HttpModule ],
-  exports:      [   
-    {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}},
-    {{/hasMore}}{{/apis}}{{/apiInfo}} 
+  exports:      [
+    {{#apiInfo}}{{#apis}}{{classname}}{{^-last}},
+    {{/-last}}{{/apis}}{{/apiInfo}}
   ],
   providers: [
-    {{#apiInfo}}{{#apis}}{{classname}}{{#hasMore}},
-    {{/hasMore}}{{/apis}}{{/apiInfo}} 
+    {{#apiInfo}}{{#apis}}{{classname}}{{^-last}},
+    {{/-last}}{{/apis}}{{/apiInfo}}
   ]
 })
 export class ApiModule {
diff --git a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api.module.ts b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api.module.ts
index 3e56bd5c091..af299fdd56d 100644
--- a/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api.module.ts
+++ b/samples/client/petstore/typescript-nestjs-v6-provided-in-root/builds/default/api.module.ts
@@ -9,11 +9,15 @@ import { UserService } from './api/user.service';
 @Global
 @Module({
   imports:      [ HttpModule ],
-  exports:      [   
-    PetServiceStoreServiceUserService 
+  exports:      [
+    PetService,
+    StoreService,
+    UserService
   ],
   providers: [
-    PetServiceStoreServiceUserService 
+    PetService,
+    StoreService,
+    UserService
   ]
 })
 export class ApiModule {