diff --git a/src/app/components/shared/map/map.component.html b/src/app/components/shared/map/map.component.html
index d93016bc6..8955dab34 100644
--- a/src/app/components/shared/map/map.component.html
+++ b/src/app/components/shared/map/map.component.html
@@ -24,10 +24,10 @@
   <p class="error-hint">
     Please ensure your ad-block is not blocking Google Maps
   </p>
+  } @else if (googleMapsLoaded === null) {
+  <baw-loading></baw-loading>
   } @else if (!hasMarkers) {
   <p>No locations specified</p>
-  } @else {
-  <baw-loading></baw-loading>
   }
 </div>
 }
diff --git a/src/app/components/shared/map/map.component.spec.ts b/src/app/components/shared/map/map.component.spec.ts
index 2c179ce7b..95bcb5fff 100644
--- a/src/app/components/shared/map/map.component.spec.ts
+++ b/src/app/components/shared/map/map.component.spec.ts
@@ -58,12 +58,14 @@ describe("MapComponent", () => {
   /** Causes all pending 'loadAsync' promises to resolve */
   function triggerLoadSuccess(): void {
     mapsServiceSpy.mapsState = GoogleMapsState.Loaded;
+    spectator.component["googleMapsLoaded"] = true;
     spectator.detectChanges();
   }
 
   /** Causes all pending 'loadAsync' promises to reject */
   function triggerLoadFailure(): void {
     mapsServiceSpy.mapsState = GoogleMapsState.Failed;
+    spectator.component["googleMapsLoaded"] = false;
     spectator.detectChanges();
   }