diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index 884922a..c242340 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -294,13 +294,20 @@ export default function DashboardPage() {
         let pairingId = userStore.getUserPairingId();
 
         // 1️⃣ Créer le pairing si non existant
-        if (!pairingId) {
-          console.log("🚀 No pairing found — creating new pairing...");
-          pairingId = await messageBus.createUserPairing();
-          console.log("✅ Pairing created:", pairingId);
+        if (!pairingId || pairingId === 'undefined' || pairingId === 'null') {
+          // We may have a pairing id but the value is not in cache for some reason
+          pairingId = await messageBus.getUserPairingId();
+          if (pairingId) {
+            userStore.pair(pairingId);
+            setUserPairingId(pairingId);
+          } else {
+            console.log("🚀 No pairing found — creating new pairing...");
+            pairingId = await messageBus.createUserPairing();
+            console.log("✅ Pairing created:", pairingId);
 
-          userStore.pair(pairingId);
-          setUserPairingId(pairingId);
+            userStore.pair(pairingId);
+            setUserPairingId(pairingId);
+          }
         } else {
           console.log("🔗 Already paired with ID:", pairingId);
         }
diff --git a/lib/4nk/UserStore.ts b/lib/4nk/UserStore.ts
index 76136dd..5eed831 100644
--- a/lib/4nk/UserStore.ts
+++ b/lib/4nk/UserStore.ts
@@ -34,6 +34,9 @@ export default class UserStore {
   }
 
   public pair(userPairingId: string): void {
+    if (!userPairingId || userPairingId === 'undefined' || userPairingId === 'null') {
+      return;
+    }
     sessionStorage.setItem('userPairingId', userPairingId);
   }