diff --git a/core/modules/toolbar/js/models/ToolbarModel.js b/core/modules/toolbar/js/models/ToolbarModel.js
index 537601d..28863a1 100644
--- a/core/modules/toolbar/js/models/ToolbarModel.js
+++ b/core/modules/toolbar/js/models/ToolbarModel.js
@@ -38,7 +38,7 @@
        * normal circumstances. It will remain active across page loads. The
        * active item is stored as an ID selector e.g. '#toolbar-item--1'.
        *
-       * @type {string}
+       * @type {null|false|string}
        */
       activeTab: null,
 
diff --git a/core/modules/toolbar/js/toolbar.js b/core/modules/toolbar/js/toolbar.js
index 8accad9..2179603 100644
--- a/core/modules/toolbar/js/toolbar.js
+++ b/core/modules/toolbar/js/toolbar.js
@@ -49,10 +49,13 @@
       // Process the administrative toolbar.
       $(context).find('#toolbar-administration').once('toolbar').each(function () {
 
+        var activeTab = JSON.parse(localStorage.getItem('Drupal.toolbar.activeTabID'));
+        activeTab = activeTab === false ? false : document.getElementById(activeTab);
+
         // Establish the toolbar models and views.
         var model = Drupal.toolbar.models.toolbarModel = new Drupal.toolbar.ToolbarModel({
           locked: JSON.parse(localStorage.getItem('Drupal.toolbar.trayVerticalLocked')) || false,
-          activeTab: document.getElementById(JSON.parse(localStorage.getItem('Drupal.toolbar.activeTabID')))
+          activeTab: activeTab
         });
         Drupal.toolbar.views.toolbarVisualView = new Drupal.toolbar.ToolbarVisualView({
           el: this,
diff --git a/core/modules/toolbar/js/views/ToolbarVisualView.js b/core/modules/toolbar/js/views/ToolbarVisualView.js
index c3b0c85..fc7538e 100644
--- a/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -107,7 +107,7 @@
         var clickedTab = event.target;
 
         // Set the event target as the active item if it is not already.
-        this.model.set('activeTab', (!activeTab || clickedTab !== activeTab) ? clickedTab : null);
+        this.model.set('activeTab', (!activeTab || clickedTab !== activeTab) ? clickedTab : false);
 
         event.preventDefault();
         event.stopPropagation();
@@ -184,7 +184,7 @@
       else {
         // There is no active tray.
         this.model.set('activeTray', null);
-        localStorage.removeItem('Drupal.toolbar.activeTabID');
+        localStorage.setItem('Drupal.toolbar.activeTabID', JSON.stringify(false));
       }
     },