diff --git a/src/components/ha-attributes.html b/src/components/ha-attributes.html
index c66029edb9..8c6a09b64e 100644
--- a/src/components/ha-attributes.html
+++ b/src/components/ha-attributes.html
@@ -32,12 +32,6 @@
 (function () {
   'use strict';
 
-  var FILTER_KEYS = [
-    'entity_picture', 'friendly_name', 'icon', 'unit_of_measurement',
-    'emulated_hue', 'emulated_hue_name', 'haaska_hidden', 'haaska_name',
-    'homebridge_hidden', 'homebridge_name', 'supported_features', 'attribution',
-    'custom_ui_state_card', 'device_class',
-  ];
   Polymer({
     is: 'ha-attributes',
     properties: {
@@ -55,7 +49,7 @@
     },
 
     computeFiltersArray: function (extraFilters) {
-      return FILTER_KEYS + (extraFilters ? extraFilters.split(',') : []);
+      return window.hassUtil.LOGIC_STATE_ATTRIBUTES + (extraFilters ? extraFilters.split(',') : []);
     },
 
     computeDisplayAttributes: function (stateObj, filtersArray) {
diff --git a/src/util/hass-util.html b/src/util/hass-util.html
index 24ac29b083..e34de18b6b 100644
--- a/src/util/hass-util.html
+++ b/src/util/hass-util.html
@@ -34,6 +34,13 @@ window.hassUtil.HIDE_MORE_INFO = [
   'input_select', 'scene', 'script', 'input_slider',
 ];
 
+window.hassUtil.LOGIC_STATE_ATTRIBUTES = [
+  'entity_picture', 'friendly_name', 'icon', 'unit_of_measurement',
+  'emulated_hue', 'emulated_hue_name', 'haaska_hidden', 'haaska_name',
+  'homebridge_hidden', 'homebridge_name', 'supported_features', 'attribution',
+  'custom_ui_state_card', 'device_class',
+];
+
 window.hassUtil.LANGUAGE = navigator.languages ?
   navigator.languages[0] : navigator.language || navigator.userLanguage;