diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 3f2ee4e699..630c9396ff 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -3505,6 +3505,7 @@ function loaded() {
                                 deleteJSONMaterialEditor();
                             }
                         }
+                        lastEntityID = null;
                         
                         resetProperties();
                         showGroupsForType("None");