diff --git a/apps/server/src/core/auth/auth.module.ts b/apps/server/src/core/auth/auth.module.ts
index 7b35a09..6041b07 100644
--- a/apps/server/src/core/auth/auth.module.ts
+++ b/apps/server/src/core/auth/auth.module.ts
@@ -1,10 +1,9 @@
-import { forwardRef, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { AuthController } from './auth.controller';
 import { AuthService } from './services/auth.service';
 import { JwtModule } from '@nestjs/jwt';
 import { EnvironmentService } from '../../environment/environment.service';
 import { TokenService } from './services/token.service';
-import { UserModule } from '../user/user.module';
 
 @Module({
   imports: [
@@ -20,7 +19,6 @@ import { UserModule } from '../user/user.module';
       },
       inject: [EnvironmentService],
     }),
-    forwardRef(() => UserModule),
   ],
   controllers: [AuthController],
   providers: [AuthService, TokenService],
diff --git a/apps/server/src/core/user/user.module.ts b/apps/server/src/core/user/user.module.ts
index 609d292..07cd196 100644
--- a/apps/server/src/core/user/user.module.ts
+++ b/apps/server/src/core/user/user.module.ts
@@ -1,4 +1,4 @@
-import { forwardRef, Global, Module } from '@nestjs/common';
+import { Global, Module } from '@nestjs/common';
 import { UserService } from './user.service';
 import { UserController } from './user.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -9,11 +9,7 @@ import { WorkspaceModule } from '../workspace/workspace.module';
 
 @Global()
 @Module({
-  imports: [
-    TypeOrmModule.forFeature([User]),
-    forwardRef(() => AuthModule),
-    WorkspaceModule,
-  ],
+  imports: [TypeOrmModule.forFeature([User]), AuthModule, WorkspaceModule],
   controllers: [UserController],
   providers: [UserService, UserRepository],
   exports: [UserService, UserRepository],