diff --git a/src/router.ts b/src/router.ts
index 770dd80..399a277 100755
--- a/src/router.ts
+++ b/src/router.ts
@@ -425,6 +425,15 @@ export async function registerAllListeners() {
     }
   }
 
+  // Remove before adding to be sure there's no duplicate
+  window.removeEventListener('message', handleRequestLink); 
+  window.removeEventListener('message', handleAddProfile);
+  window.removeEventListener('message', handleGetProcesses);
+  window.removeEventListener('message', handleAddFolder);
+  window.removeEventListener('message', handleDecryptState);
+  window.removeEventListener('message', handleValidateToken);
+  window.removeEventListener('message', handleRenewToken);
+
   window.addEventListener('message', handleRequestLink); 
   window.addEventListener('message', handleAddProfile);
   window.addEventListener('message', handleGetProcesses);