diff --git a/web/api/src/main/java/org/onosproject/rest/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/ConfigProvider.java
index 805ef14..8a9f3aa 100644
--- a/web/api/src/main/java/org/onosproject/rest/ConfigProvider.java
+++ b/web/api/src/main/java/org/onosproject/rest/ConfigProvider.java
@@ -154,6 +154,10 @@
                 prepareForDeviceEvents(nodes.size());
                 for (JsonNode node : nodes) {
                     parseDevice(node);
+
+                    // FIXME: hack to make sure device attributes take
+                    // This will be fixed when GossipDeviceStore uses ECM
+                    parseDevice(node);
                 }
             }
         } finally {
@@ -237,7 +241,10 @@
             if (nodes != null) {
                 for (JsonNode node : nodes) {
                     parseHost(node);
-                    parseHost(node); // FIXME: hack to make sure host positions take
+
+                    // FIXME: hack to make sure host attributes take
+                    // This will be fixed when GossipHostStore uses ECM
+                    parseHost(node);
                 }
             }
         } finally {