diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php
index b89e9a3ca..fdec3fc26 100644
--- a/html/includes/common/worldmap.inc.php
+++ b/html/includes/common/worldmap.inc.php
@@ -123,11 +123,13 @@ var greenMarker = L.AwesomeMarkers.icon({
         }
         foreach (dbFetchRows($sql, array($_SESSION['user_id'])) as $map_devices) {
             $icon = 'greenMarker';
+            $z_offset = 0;
             if ($map_devices['status'] == 0) {
                 $icon = 'redMarker';
+                $z_offset = 10000;  // move marker to foreground
             }
             $temp_output .= "var title = '<a href=\"" . generate_device_url($map_devices) . "\"><img src=\"".getImageSrc($map_devices)."\" width=\"32\" height=\"32\" alt=\"\">".$map_devices['hostname']."</a>';
-var marker = L.marker(new L.LatLng(".$map_devices['lat'].", ".$map_devices['lng']."), {title: title, icon: $icon});
+var marker = L.marker(new L.LatLng(".$map_devices['lat'].", ".$map_devices['lng']."), {title: title, icon: $icon, zIndexOffset: $z_offset});
 marker.bindPopup(title);
     markers.addLayer(marker);\n";
         }