diff --git a/client/src/pages/MapView.jsx b/client/src/pages/MapView.jsx
index 0506826..3c616a8 100644
--- a/client/src/pages/MapView.jsx
+++ b/client/src/pages/MapView.jsx
@@ -422,8 +422,11 @@ const MapView = () => {
                           dashArray: dashPattern
                         }}
                         eventHandlers={{
-                          click: () => {
+                          click: (e) => {
+                            e.originalEvent.preventDefault();
+                            e.originalEvent.stopPropagation();
                             console.log('MapView: Ring clicked for drone:', detection);
+                            setSelectedDetection(detection);
                           }
                         }}
                       >
@@ -719,13 +722,19 @@ const DroneDetectionPopup = ({ detection, age, droneTypes, droneDetectionHistory
             <div className="flex justify-between">
               <span className="text-gray-600">First detected:</span>
               <span className="font-mono text-gray-900">
-                {format(new Date(firstDetection.device_timestamp), 'MMM dd, HH:mm:ss')}
+                {firstDetection.device_timestamp ? 
+                  format(new Date(firstDetection.device_timestamp), 'MMM dd, HH:mm:ss') : 
+                  'Unknown'
+                }
               </span>
             </div>
             <div className="flex justify-between">
               <span className="text-gray-600">Latest detection:</span>
               <span className="font-mono text-gray-900">
-                {format(new Date(detection.device_timestamp), 'MMM dd, HH:mm:ss')}
+                {detection.device_timestamp ? 
+                  format(new Date(detection.device_timestamp), 'MMM dd, HH:mm:ss') : 
+                  'Unknown'
+                }
               </span>
             </div>
             {droneHistory.length > 1 && (