diff --git a/src/solid-xmpp-chat.js b/src/solid-xmpp-chat.js
index c64a644d203ad5f320a417225a07fc86583696d5..d03d0482c1b1acd68211e57a6313dc4867713d6a 100644
--- a/src/solid-xmpp-chat.js
+++ b/src/solid-xmpp-chat.js
@@ -106,7 +106,16 @@ export const SolidXMPPChat = {
       'plugins': {}
     };
 
-    sessionStorage.clear();
+    for(var key in sessionStorage){
+        if(sessionStorage.hasOwnProperty(key) && /converse/.test(key)){
+            sessionStorage.removeItem(key);
+        }
+    }
+    for(var key in localStorage){
+        if(localStorage.hasOwnProperty(key) && /converse/.test(key)){
+            localStorage.removeItem(key);
+        }
+    }
     indexedDB.deleteDatabase('converse-persistent');
 
     // Alias for solid-xmpp-chat use # want to un-expose converse from window later