diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index d68bbdb29..0f5e43ffe 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -408,6 +408,8 @@ export function uiPresetList(context) {
 
     function updateForFeatureHiddenState() {
 
+        if (!context.hasEntity(_entityID)) return;
+
         var geometry = context.geometry(_entityID);
 
         var button = d3_selectAll('.preset-list .preset-list-button');