diff --git a/generators/entity-server/templates/server/src/web/rest/entity.controller.ts.ejs b/generators/entity-server/templates/server/src/web/rest/entity.controller.ts.ejs
index b4f428da..0ccac380 100644
--- a/generators/entity-server/templates/server/src/web/rest/entity.controller.ts.ejs
+++ b/generators/entity-server/templates/server/src/web/rest/entity.controller.ts.ejs
@@ -3,8 +3,9 @@ import { <% if (authenticationType === 'jwt') { _%> ApiBearerAuth, <% } else if
 import { <%= entityClass %>DTO } from '../../service/dto/<%= entityFileName %>.dto';
 import { <%= entityClass %>Service } from '../../service/<%= entityFileName %>.service';
 import { PageRequest, Page } from '../../domain/base/pagination.entity';
-import { AuthGuard, Request, Roles, RolesGuard, RoleType } from '../../security';
+import { AuthGuard,  Roles, RolesGuard, RoleType } from '../../security';
 import { HeaderUtil } from '../../client/header-util';
+import { Request } from '../../client/request';
 import { LoggingInterceptor } from '../../client/interceptors/logging.interceptor';
 
 @Controller('api/<%= entityApiUrl %>')
diff --git a/generators/server/files.js b/generators/server/files.js
index 3d4d8dd7..5b78de3a 100644
--- a/generators/server/files.js
+++ b/generators/server/files.js
@@ -34,10 +34,10 @@ const serverFiles = {
                 'src/security/password-util.ts',
                 'src/security/decorators/auth-user.decorator.ts',
                 'src/security/decorators/roles.decorator.ts',
-                'src/security/request.ts',
                 'src/security/index.ts',
                 'src/client/header-util.ts',
                 'src/client/interceptors/logging.interceptor.ts',
+                'src/client/request.ts',
                 'src/service/auth.service.ts',
                 'src/service/user.service.ts',
                 'src/service/dto/base.dto.ts',
diff --git a/generators/server/templates/server/src/security/request.ts.ejs b/generators/server/templates/server/src/client/request.ts.ejs
similarity index 100%
rename from generators/server/templates/server/src/security/request.ts.ejs
rename to generators/server/templates/server/src/client/request.ts.ejs
diff --git a/generators/server/templates/server/src/security/index.ts.ejs b/generators/server/templates/server/src/security/index.ts.ejs
index 97996e09..ec7e85e1 100644
--- a/generators/server/templates/server/src/security/index.ts.ejs
+++ b/generators/server/templates/server/src/security/index.ts.ejs
@@ -3,5 +3,4 @@ export * from './guards/roles.guard';
 export * from './decorators/roles.decorator';
 export * from './decorators/auth-user.decorator';
 export * from './password-util';
-export * from './request';
 export * from './role-type';
diff --git a/generators/server/templates/server/src/web/rest/user.controller.ts.ejs b/generators/server/templates/server/src/web/rest/user.controller.ts.ejs
index 5986f925..c70c6d67 100644
--- a/generators/server/templates/server/src/web/rest/user.controller.ts.ejs
+++ b/generators/server/templates/server/src/web/rest/user.controller.ts.ejs
@@ -1,8 +1,9 @@
 import { Body, Controller, Delete, Get, Logger, Param, Post, Put, UseGuards, Req, UseInterceptors, ClassSerializerInterceptor } from '@nestjs/common';
-import { AuthGuard, Request, Roles, RolesGuard, RoleType } from '../../security';
+import { AuthGuard,  Roles, RolesGuard, RoleType } from '../../security';
 import { PageRequest, Page } from '../../domain/base/pagination.entity';
 import { UserDTO } from '../../service/dto/user.dto';
 import { HeaderUtil } from '../../client/header-util';
+import { Request } from '../../client/request';
 import { LoggingInterceptor } from '../../client/interceptors/logging.interceptor';
 import {<%_ if (authenticationType === 'jwt') { _%> ApiBearerAuth, <%_ } else if (authenticationType === 'oauth2') { _%> ApiOAuth2Auth, <%_ } _%> ApiUseTags, ApiResponse, ApiOperation } from '@nestjs/swagger';
 import { UserService } from '../../service/user.service';