diff --git a/src/features/common/services/authService.js b/src/features/common/services/authService.js
index 19cde51..45556c3 100644
--- a/src/features/common/services/authService.js
+++ b/src/features/common/services/authService.js
@@ -4,6 +4,7 @@ const { getFirebaseAuth } = require('./firebaseClient');
 const fetch = require('node-fetch');
 const encryptionService = require('./encryptionService');
 const migrationService = require('./migrationService');
+const userRepository = require('../repositories/user');
 const sessionRepository = require('../repositories/session');
 const providerSettingsRepository = require('../repositories/providerSettings');
 const userModelSelectionsRepository = require('../repositories/userModelSelections');
@@ -46,6 +47,7 @@ class AuthService {
         encryptionService.initializeKey(this.currentUserId);
         this.initializationPromise = null;
 
+        userRepository.setAuthService(this);
         sessionRepository.setAuthService(this);
         providerSettingsRepository.setAuthService(this);
         userModelSelectionsRepository.setAuthService(this);
diff --git a/src/features/common/services/modelStateService.js b/src/features/common/services/modelStateService.js
index a6162b5..c331958 100644
--- a/src/features/common/services/modelStateService.js
+++ b/src/features/common/services/modelStateService.js
@@ -17,10 +17,6 @@ class ModelStateService extends EventEmitter {
         this.store = new Store({ name: 'pickle-glass-model-state' });
         this.state = {};
         this.hasMigrated = false;
-        
-        // Set auth service for repositories
-        providerSettingsRepository.setAuthService(authService);
-        userModelSelectionsRepository.setAuthService(authService);
     }
 
     // 모든 윈도우에 이벤트 브로드캐스트
diff --git a/src/index.js b/src/index.js
index e64f06f..627c560 100644
--- a/src/index.js
+++ b/src/index.js
@@ -532,7 +532,6 @@ async function handleFirebaseAuthCallback(params) {
         };
 
         // 1. Sync user data to local DB
-        userRepository.setAuthService(authService);
         userRepository.findOrCreate(firebaseUser);
         console.log('[Auth] User data synced with local DB.');