diff --git a/zap/src/main/java/org/zaproxy/zap/view/HttpPanelManager.java b/zap/src/main/java/org/zaproxy/zap/view/HttpPanelManager.java
index 797683dde97..c3538b0a1af 100644
--- a/zap/src/main/java/org/zaproxy/zap/view/HttpPanelManager.java
+++ b/zap/src/main/java/org/zaproxy/zap/view/HttpPanelManager.java
@@ -327,7 +327,7 @@ public void removeViewFactory(String componentName, String viewFactoryName) {
             componentViews.remove(viewFactoryName);
 
             if (componentViews.isEmpty()) {
-                this.views.put(componentName, null);
+                this.views.remove(componentName);
             }
         }
 
@@ -376,7 +376,7 @@ public void removeDefaultViewSelectorFactory(String componentName, String viewFa
             componentDefaultViews.remove(viewFactoryName);
 
             if (componentDefaultViews.isEmpty()) {
-                this.defaultViews.put(componentName, null);
+                this.defaultViews.remove(componentName);
             }
         }