diff --git a/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js b/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js
index df67061..76893f1 100644
--- a/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo2/topo2DeviceDetailsPanel.js
@@ -104,7 +104,6 @@
 
         detailsPanel.emptyRegions();
 
-
         var navFn = function () {
             ns.navTo(devicePath, { devId: data.id });
         };
@@ -121,6 +120,11 @@
         gs.addGlyph(svg, (data.type || 'unknown'), 26);
         title.text(data.title);
 
+        if (!data.props.Latitude) {
+            var locationIndex = data.propOrder.indexOf('Latitude');
+            data.propOrder.splice(locationIndex - 1, 3);
+        }
+
         ls.listProps(tbody, data);
         addBtnFooter();
     }