diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts
index 20def652d177c30fec9b8b7eebdb039386283954..586f8b5e5b34feb378f76a3b4f8313843a6a7859 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts
@@ -37,12 +37,13 @@ export class DynamicHazardCompareGuard {
     | Promise<boolean | UrlTree>
     | boolean
     | UrlTree {
-    this.spinnerService.remove();
-    this.spinnerService.show('Checking for comparable models');
+    const spinnerRef = this.spinnerService.show(
+      'Checking for comparable models',
+    );
 
     return this.hasComparableModels$.pipe(
       map(hasComparableModels => {
-        this.spinnerService.remove();
+        spinnerRef.close();
 
         if (!hasComparableModels) {
           this.nshmpService.throwError$(new Error(this.errorMessage));