diff --git a/app/src/frontend/building/data-container.tsx b/app/src/frontend/building/data-container.tsx
index ce1db51b..f0c1d674 100644
--- a/app/src/frontend/building/data-container.tsx
+++ b/app/src/frontend/building/data-container.tsx
@@ -84,7 +84,7 @@ const withCopyEdit: (wc: React.ComponentType<CategoryViewProps>) => DataContaine
             const categoryKeys = {};
 
             for (let key in dataFields) {
-                if (dataFields[key].category == props.cat){
+                if (dataFields[key].category == props.cat && props.building[key] != null){
                     categoryKeys[key] = true;
                 }
             }