diff --git a/nullboard.html b/nullboard.html
index a9d0394..cea4746 100644
--- a/nullboard.html
+++ b/nullboard.html
@@ -3109,8 +3109,10 @@
          globalStorage.del(k);
       });
       popAllNamespaces(namespace);
-      setGlobalStorage(getAllNamespaces()[0]);
-      return false;
+      var namespaces = getAllNamespaces();
+      fallbackNamespace = namespaces[0];
+      setGlobalStorage(fallbackNamespace);
+      return true;
    });
 
    $('.config .switch-namespace').click(function() {
@@ -3277,7 +3279,6 @@
 
       setCurrentNamespace(namespace);
       updateNamespaceIndex();
-      console.log("set global storage and current namespace to: " + namespace);
 
       //
       if (globalStorage.get('nullboard.theme') == 'dark')
@@ -3293,9 +3294,11 @@
       //
       var board_id = globalStorage.get('nullboard.last_board');
 
+      document.board = null;
       if (board_id)
          document.board = loadBoard(board_id);
 
+
       updateBoardIndex();
 
       if (! document.board && ! $('.config .load-board').length)
@@ -3345,12 +3348,15 @@
 
    function getAllNamespaces()
    {
-      return JSON.parse(new Local().get("namespaces") || '["initial"]') || ["initial"];
+      var namespaces = new Local().get("namespaces");
+      if (! namespaces || namespaces == "[]")
+         namespaces = "[\"initial\"]";
+      return JSON.parse(namespaces);
    }
 
    function getCurrentNamespace()
    {
-      return new Local().get("namespace") || getAllNamespaces[0];
+      return new Local().get("namespace") || getAllNamespaces()[0];
    }
 
    setGlobalStorage(getCurrentNamespace());