diff --git a/src/common/entity/get_view_entities.ts b/src/common/entity/get_view_entities.ts
index 9b2155244f..cc4cb07d9b 100644
--- a/src/common/entity/get_view_entities.ts
+++ b/src/common/entity/get_view_entities.ts
@@ -14,20 +14,20 @@ export const getViewEntities = (
   view.attributes.entity_id.forEach((entityId) => {
     const entity = entities[entityId];
 
-    if (entity && !entity.attributes.hidden) {
-      viewEntities[entity.entity_id] = entity;
+    if (!entity) {
+      return;
+    }
 
-      if (computeDomain(entity.entity_id) === "group") {
-        const groupEntities = getGroupEntities(entities, entity as GroupEntity);
+    viewEntities[entity.entity_id] = entity;
 
-        Object.keys(groupEntities).forEach((grEntityId) => {
-          const grEntity = groupEntities[grEntityId];
+    if (computeDomain(entity.entity_id) === "group") {
+      const groupEntities = getGroupEntities(entities, entity as GroupEntity);
 
-          if (!grEntity.attributes.hidden) {
-            viewEntities[grEntityId] = grEntity;
-          }
-        });
-      }
+      Object.keys(groupEntities).forEach((grEntityId) => {
+        const grEntity = groupEntities[grEntityId];
+
+        viewEntities[grEntityId] = grEntity;
+      });
     }
   });
 
diff --git a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
index 8e28351bef..4883ddb402 100644
--- a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
+++ b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
@@ -487,7 +487,6 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
           return false;
         }
         return (
-          !ent.attributes.hidden &&
           "node_id" in ent.attributes &&
           ent.attributes.node_id === nodeid &&
           !ent.entity_id.match("zwave[.]")
diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts
index 9b3f1c830b..cc6b24611c 100644
--- a/src/panels/lovelace/common/generate-lovelace-config.ts
+++ b/src/panels/lovelace/common/generate-lovelace-config.ts
@@ -60,6 +60,7 @@ const HIDE_DOMAIN = new Set([
   "device_tracker",
   "geo_location",
   "persistent_notification",
+  "zone",
 ]);
 
 let subscribedRegistries = false;
@@ -227,10 +228,7 @@ const computeDefaultViewStates = (entities: HassEntities): HassEntities => {
   const states = {};
   Object.keys(entities).forEach((entityId) => {
     const stateObj = entities[entityId];
-    if (
-      !stateObj.attributes.hidden &&
-      !HIDE_DOMAIN.has(computeStateDomain(stateObj))
-    ) {
+    if (!HIDE_DOMAIN.has(computeStateDomain(stateObj))) {
       states[entityId] = entities[entityId];
     }
   });
diff --git a/src/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js
index 4490504b65..3a89207227 100644
--- a/src/panels/map/ha-panel-map.js
+++ b/src/panels/map/ha-panel-map.js
@@ -124,7 +124,6 @@ class HaPanelMap extends LocalizeMixin(PolymerElement) {
       var entity = hass.states[entityId];
 
       if (
-        (entity.attributes.hidden && computeStateDomain(entity) !== "zone") ||
         entity.state === "home" ||
         !("latitude" in entity.attributes) ||
         !("longitude" in entity.attributes)
diff --git a/src/util/hass-attributes-util.js b/src/util/hass-attributes-util.js
index 4eb17735a0..dd1d78c8ae 100644
--- a/src/util/hass-attributes-util.js
+++ b/src/util/hass-attributes-util.js
@@ -92,7 +92,6 @@ hassAttributeUtil.LOGIC_STATE_ATTRIBUTES = hassAttributeUtil.LOGIC_STATE_ATTRIBU
     description: "Device class",
     domains: ["binary_sensor", "cover", "humidifier", "sensor", "switch"],
   },
-  hidden: { type: "boolean", description: "Hide from UI" },
   assumed_state: {
     type: "boolean",
     domains: [
diff --git a/test-mocha/common/entity/get_view_entities.spec.ts b/test-mocha/common/entity/get_view_entities.spec.ts
index fa2f0f6840..ae3cd13192 100644
--- a/test-mocha/common/entity/get_view_entities.spec.ts
+++ b/test-mocha/common/entity/get_view_entities.spec.ts
@@ -4,7 +4,6 @@ import { getViewEntities } from "../../../src/common/entity/get_view_entities";
 
 import {
   createEntities,
-  createEntity,
   createGroup,
   createView,
   entityMap,
@@ -47,33 +46,4 @@ describe("getViewEntities", () => {
 
     assert.deepEqual(expectedEntities, getViewEntities(entities, view));
   });
-
-  it("should not include hidden entities inside groups", () => {
-    const visibleEntity = createEntity({ attributes: { hidden: false } });
-    const hiddenEntity = createEntity({ attributes: { hidden: true } });
-    const group1 = createGroup({
-      attributes: {
-        entity_id: [visibleEntity.entity_id, hiddenEntity.entity_id],
-      },
-    });
-
-    const entities = {
-      [visibleEntity.entity_id]: visibleEntity,
-      [hiddenEntity.entity_id]: hiddenEntity,
-      [group1.entity_id]: group1,
-    };
-
-    const view = createView({
-      attributes: {
-        entity_id: [group1.entity_id],
-      },
-    });
-
-    const expectedEntities = {
-      [visibleEntity.entity_id]: visibleEntity,
-      [group1.entity_id]: group1,
-    };
-
-    assert.deepEqual(expectedEntities, getViewEntities(entities, view));
-  });
 });