diff --git a/ui/src/app/widget/lib/map-widget2.js b/ui/src/app/widget/lib/map-widget2.js
index 3d3fd4a38d..d1d6af490e 100644
--- a/ui/src/app/widget/lib/map-widget2.js
+++ b/ui/src/app/widget/lib/map-widget2.js
@@ -616,7 +616,7 @@ export default class TbMapWidgetV2 {
 							locationChanged = true;
 						}
 					}
-				} else {
+				} else if (latData.length > 0 && lngData.length > 0) {
 					// Create or update marker
 					lat = latData[latData.length - 1][1];
 					lng = lngData[lngData.length - 1][1];