diff --git a/client/src/pages/MapView.jsx b/client/src/pages/MapView.jsx
index 3c616a8..278339e 100644
--- a/client/src/pages/MapView.jsx
+++ b/client/src/pages/MapView.jsx
@@ -762,8 +762,8 @@ const DroneDetectionPopup = ({ detection, age, droneTypes, droneDetectionHistory
                    '➡️ STABLE POSITION'}
                 </div>
                 <div className="mt-1">
-                  RSSI change: {movementTrend.change > 0 ? '+' : ''}{movementTrend.change.toFixed(1)}dB
-                  over {movementTrend.duration.toFixed(1)} minutes
+                  RSSI change: {movementTrend.change > 0 ? '+' : ''}{typeof movementTrend.change === 'number' ? movementTrend.change.toFixed(1) : 'N/A'}dB
+                  over {typeof movementTrend.duration === 'number' ? movementTrend.duration.toFixed(1) : 'N/A'} minutes
                 </div>
               </div>
               
@@ -799,11 +799,15 @@ const DroneDetectionPopup = ({ detection, age, droneTypes, droneDetectionHistory
           <div className="grid grid-cols-2 gap-2 text-xs">
             <div>
               <span className="text-gray-600">Confidence:</span>
-              <div className="text-gray-900">{(detection.confidence_level * 100).toFixed(0)}%</div>
+              <div className="text-gray-900">
+                {typeof detection.confidence_level === 'number' ? (detection.confidence_level * 100).toFixed(0) : 'N/A'}%
+              </div>
             </div>
             <div>
               <span className="text-gray-600">Duration:</span>
-              <div className="text-gray-900">{(detection.signal_duration / 1000).toFixed(1)}s</div>
+              <div className="text-gray-900">
+                {typeof detection.signal_duration === 'number' ? (detection.signal_duration / 1000).toFixed(1) : 'N/A'}s
+              </div>
             </div>
             <div>
               <span className="text-gray-600">Detector:</span>
@@ -812,7 +816,7 @@ const DroneDetectionPopup = ({ detection, age, droneTypes, droneDetectionHistory
             <div>
               <span className="text-gray-600">Location:</span>
               <div className="text-gray-900 font-mono">
-                {detection.geo_lat?.toFixed(4)}, {detection.geo_lon?.toFixed(4)}
+                {typeof detection.geo_lat === 'number' ? detection.geo_lat.toFixed(4) : 'N/A'}, {typeof detection.geo_lon === 'number' ? detection.geo_lon.toFixed(4) : 'N/A'}
               </div>
             </div>
           </div>
@@ -843,7 +847,7 @@ const DroneDetectionPopup = ({ detection, age, droneTypes, droneDetectionHistory
                     {detection.movement_analysis.rssiTrend.trend}
                     {detection.movement_analysis.rssiTrend.change !== 0 && (
                       <span className="ml-1">
-                        ({detection.movement_analysis.rssiTrend.change > 0 ? '+' : ''}{detection.movement_analysis.rssiTrend.change.toFixed(1)}dB)
+                        ({detection.movement_analysis.rssiTrend.change > 0 ? '+' : ''}{typeof detection.movement_analysis.rssiTrend.change === 'number' ? detection.movement_analysis.rssiTrend.change.toFixed(1) : 'N/A'}dB)
                       </span>
                     )}
                   </span>