diff --git a/packages/frinx-device-topology/src/pages/topology/map/map-topology.container.tsx b/packages/frinx-device-topology/src/pages/topology/map/map-topology.container.tsx
index 7ee5d98d2..d04dcafe2 100644
--- a/packages/frinx-device-topology/src/pages/topology/map/map-topology.container.tsx
+++ b/packages/frinx-device-topology/src/pages/topology/map/map-topology.container.tsx
@@ -110,12 +110,12 @@ const MapTopologyContainerDescendant: VoidFunctionComponent = () => {
       {deviceData && (
         <MarkerClusterGroup chunkedLoading maxClusterRadius={30}>
           {deviceData?.map((node) => {
-            if (node?.geolocation?.latitude && node?.geolocation?.longitude) {
+            if (node?.geolocation?.latitude && node?.geolocation?.longitude && node.id !== selectedDeviceData?.id) {
               return (
                 <Marker
                   position={[node.geolocation.latitude, node.geolocation.longitude]}
                   key={node.id}
-                  icon={node.id === selectedDeviceData?.id ? RED_DEFAULT_ICON : DEFAULT_ICON}
+                  icon={DEFAULT_ICON}
                   eventHandlers={{
                     click: handleMarkerClick(node.deviceName || ''),
                   }}
@@ -132,6 +132,13 @@ const MapTopologyContainerDescendant: VoidFunctionComponent = () => {
           })}
         </MarkerClusterGroup>
       )}
+      {selectedDeviceData && selectedDeviceData.geolocation?.latitude && selectedDeviceData.geolocation?.longitude && (
+        <Marker
+          position={[selectedDeviceData.geolocation.latitude, selectedDeviceData.geolocation.longitude]}
+          key={selectedDeviceData.id}
+          icon={RED_DEFAULT_ICON}
+        />
+      )}
       {selectedDeviceData && (
         <Card zIndex={500} minWidth={150} position="absolute" right={2} bottom={6}>
           <CloseButton size="md" onClick={handlePopupClose} />