diff --git a/apps/nowcasting-app/components/map/pvLatestMap.tsx b/apps/nowcasting-app/components/map/pvLatestMap.tsx
index 78c9b601..7428e105 100644
--- a/apps/nowcasting-app/components/map/pvLatestMap.tsx
+++ b/apps/nowcasting-app/components/map/pvLatestMap.tsx
@@ -325,7 +325,7 @@ const PvLatestMap: React.FC<PvLatestMapProps> = ({
       });
 
       map.on("data", (e) => {
-        if (e.sourceId === "latestPV" && e.isSourceLoaded) {
+        if (e.dataType === "source" && e.sourceId === "latestPV" && e.isSourceLoaded) {
           setMapDataLoading(false);
         }
       });