diff --git a/src/FlightMap/Widgets/MapFitFunctions.qml b/src/FlightMap/Widgets/MapFitFunctions.qml
index cac5d32e0824f50c0a40383462831e4382560d4c..527685b30b507b587047fcc3f302cfa83dbce636 100644
--- a/src/FlightMap/Widgets/MapFitFunctions.qml
+++ b/src/FlightMap/Widgets/MapFitFunctions.qml
@@ -48,7 +48,10 @@ Item {
     function fitMapViewportToAllCoordinates(coordList) {
         var mapFitViewport = Qt.rect(0, 0, map.width, map.height)
         if (coordList.length == 0) {
-            map.center = fitHomePosition()
+            var homeCoord = fitHomePosition()
+            if (homeCoord.isValid) {
+                map.center = homeCoord
+            }
             return
         }