diff --git a/server/src/modules/auth/auth.module.ts b/server/src/modules/auth/auth.module.ts
index 7f253fb480..eee61c0e48 100644
--- a/server/src/modules/auth/auth.module.ts
+++ b/server/src/modules/auth/auth.module.ts
@@ -34,7 +34,7 @@ import { SessionService } from '@services/session.service';
 import { SessionScheduler } from 'src/schedulers/session.scheduler';
 import { TooljetDbModule } from '../tooljet_db/tooljet_db.module';
 import { UserResourcePermissionsModule } from '@module/user_resource_permissions/user_resource_permissions.module';
-import { InstanceSettingsService } from '@instance-settings/service';
+import { InstanceSettingsModule } from '@instance-settings/module';
 
 @Module({
   imports: [
@@ -63,6 +63,7 @@ import { InstanceSettingsService } from '@instance-settings/service';
       inject: [ConfigService],
     }),
     TooljetDbModule,
+    InstanceSettingsModule,
   ],
   providers: [
     AuthService,
@@ -83,7 +84,6 @@ import { InstanceSettingsService } from '@instance-settings/service';
     PluginsHelper,
     SessionService,
     SessionScheduler,
-    InstanceSettingsService,
   ],
   controllers: [OauthController],
   exports: [AuthService, SessionService],
diff --git a/server/src/modules/comments/comment.module.ts b/server/src/modules/comments/comment.module.ts
index 4ef177af71..b217151577 100644
--- a/server/src/modules/comments/comment.module.ts
+++ b/server/src/modules/comments/comment.module.ts
@@ -10,11 +10,11 @@ import { Organization } from 'src/entities/organization.entity';
 import { AppVersion } from 'src/entities/app_version.entity';
 import { CommentUsers } from 'src/entities/comment_user.entity';
 import { Comment } from 'src/entities/comment.entity';
-import { InstanceSettingsService } from '@instance-settings/service';
+import { InstanceSettingsModule } from '@instance-settings/module';
 
 @Module({
   controllers: [CommentController],
-  imports: [TypeOrmModule.forFeature([Comment, CommentUsers, AppVersion, User, Organization]), CaslModule],
-  providers: [CommentService, EmailService, CommentRepository, InstanceSettingsService],
+  imports: [TypeOrmModule.forFeature([Comment, CommentUsers, AppVersion, User, Organization]), CaslModule, InstanceSettingsModule],
+  providers: [CommentService, EmailService, CommentRepository],
 })
 export class CommentModule {}
diff --git a/server/src/modules/organizations/organizations.module.ts b/server/src/modules/organizations/organizations.module.ts
index 07d15107a4..8e29568f71 100644
--- a/server/src/modules/organizations/organizations.module.ts
+++ b/server/src/modules/organizations/organizations.module.ts
@@ -33,7 +33,7 @@ import { MetadataService } from '@services/metadata.service';
 import { SessionService } from '@services/session.service';
 import { TooljetDbModule } from '../tooljet_db/tooljet_db.module';
 import { UserResourcePermissionsModule } from '@module/user_resource_permissions/user_resource_permissions.module';
-import { InstanceSettingsService } from '@instance-settings/service';
+import { InstanceSettingsModule } from '@instance-settings/module';
 
 @Module({
   imports: [
@@ -62,6 +62,7 @@ import { InstanceSettingsService } from '@instance-settings/service';
     }),
     TooljetDbModule,
     UserResourcePermissionsModule,
+    InstanceSettingsModule,
   ],
   providers: [
     OrganizationsService,
@@ -79,7 +80,6 @@ import { InstanceSettingsService } from '@instance-settings/service';
     MetadataService,
     AppEnvironmentService,
     SessionService,
-    InstanceSettingsService,
   ],
   controllers: [OrganizationsController, OrganizationUsersController],
   exports: [OrganizationsService, OrganizationUsersService],