diff --git a/lib/data/services/auth_service.dart b/lib/data/services/auth_service.dart
index b8c929f..9b39858 100644
--- a/lib/data/services/auth_service.dart
+++ b/lib/data/services/auth_service.dart
@@ -25,13 +25,21 @@ class AuthService {
     required String username,
     required String password,
   }) async {
-    //get device fcm token
-    final FirebaseMessaging firebaseMessaging = FirebaseMessaging.instance;
-    final fcmToken = await firebaseMessaging.getToken();
+    //get device fcm token with error handling
+    String fcmToken = '';
+    try {
+      final FirebaseMessaging firebaseMessaging = FirebaseMessaging.instance;
+      fcmToken = await firebaseMessaging.getToken() ?? '';
+      AppLogger().info('📱 FCM Token retrieved successfully');
+    } catch (e) {
+      AppLogger().error('❌ Failed to get FCM token: $e');
+      fcmToken = '';
+    }
+
     var data = jsonEncode({
       "password": password,
       "username": username,
-      "device_token": fcmToken ?? '',
+      "device_token": fcmToken,
     });
 
     final result = await _networkManager.makeRequest(