diff --git a/siro_admin/lib/controller/functions/crud.dart b/siro_admin/lib/controller/functions/crud.dart
index da7c85c..8ea97e0 100644
--- a/siro_admin/lib/controller/functions/crud.dart
+++ b/siro_admin/lib/controller/functions/crud.dart
@@ -48,6 +48,7 @@ class CRUD {
       final jwt = decodedResponse1['jwt'];
       Log.print('jwt: ${jwt}');
       await box.write(BoxName.jwt, X.c(X.c(X.c(jwt, cn), cC), cs));
+      await storage.write(key: BoxName.jwt, value: X.c(X.c(X.c(jwt, cn), cC), cs));
       // await AppInitializer().getKey();
     }
   }
diff --git a/siro_rider/lib/controller/auth/login_controller.dart b/siro_rider/lib/controller/auth/login_controller.dart
index 8291995..2ddb8b9 100644
--- a/siro_rider/lib/controller/auth/login_controller.dart
+++ b/siro_rider/lib/controller/auth/login_controller.dart
@@ -126,13 +126,13 @@ class LoginController extends GetxController {
           if (jwt != null) {
             // نشفر الـ JWT بالتشفير الثلاثي قبل التخزين في GetStorage
             box.write(BoxName.jwt, c(jwt));
+            storage.write(key: BoxName.jwt, value: c(jwt));
           }
 
           await EncryptionHelper.initialize();
         }
       } else {
-        // ── مستخدم موجود: تجديد التوكن ────────────────────────
-        await EncryptionHelper.initialize();
+        // ── مستخدم موجود: تجديد التوكن
 
         var payload = {
           'id': box.read(BoxName.passengerID),
@@ -158,6 +158,7 @@ class LoginController extends GetxController {
 
           if (jwt != null) {
             box.write(BoxName.jwt, c(jwt));
+            storage.write(key: BoxName.jwt, value: c(jwt));
           }
         }
       }
diff --git a/siro_service/lib/controller/functions/crud.dart b/siro_service/lib/controller/functions/crud.dart
index bf9b828..9b10d10 100644
--- a/siro_service/lib/controller/functions/crud.dart
+++ b/siro_service/lib/controller/functions/crud.dart
@@ -297,6 +297,7 @@ class CRUD {
       Log.print('hmac_key: $hmac');
 
       await box.write(BoxName.jwt, c(jwt));
+      await storage.write(key: BoxName.jwt, value: c(jwt));
       if (hmac != null) {
         await box.write(BoxName.hmac, hmac);
         final verify = box.read(BoxName.hmac);
diff --git a/siro_service/lib/controller/login_controller.dart b/siro_service/lib/controller/login_controller.dart
index 7ded33d..a6b2a89 100644
--- a/siro_service/lib/controller/login_controller.dart
+++ b/siro_service/lib/controller/login_controller.dart
@@ -129,6 +129,7 @@ class LoginController extends GetxController {
         final jwt = loginData['jwt'];
         final hmac = loginData['hmac'];
         await box.write(BoxName.jwt, c(jwt));
+        await storage.write(key: BoxName.jwt, value: c(jwt));
         if (hmac != null) {
           await box.write(BoxName.hmac, hmac);
         }