diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts
index ed7e68cdb2a13134d56a4082a7956654aa156e18..9809620ec6eab3096234083cb5557222b12b1745 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/app.component.spec.ts
@@ -2,7 +2,6 @@ import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
 import {provideRouter} from '@angular/router';
-import {provideMockStore} from '@ngrx/store/testing';
 
 import {AppComponent} from './app.component';
 import {AboutComponent} from './components/about/about.component';
@@ -34,7 +33,6 @@ describe('AppComponent', () => {
         ParameterSummaryComponent,
       ],
       providers: [
-        provideMockStore({initialState: {}}),
         provideHttpClient(),
         provideNoopAnimations(),
         provideRouter([]),
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.spec.ts
index 3c7ea105abe149d229ee4159046bfe9eae280029..a02bce78bf9b9f4a786db9b0bb7913fb4daadfda 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/content/content.component.spec.ts
@@ -1,6 +1,7 @@
+import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideRouter} from '@angular/router';
 
 import {ContentComponent} from './content.component';
 
@@ -12,8 +13,9 @@ describe('ContentComponent', () => {
     await TestBed.configureTestingModule({
       imports: [ContentComponent],
       providers: [
-        provideMockStore({initialState: {}}),
         provideNoopAnimations(),
+        provideHttpClient(),
+        provideRouter([]),
       ],
     }).compileComponents();
 
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/control-panel/control-panel.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/control-panel/control-panel.component.spec.ts
index 17b38b87c795f14adb6a7164459f488b9a119b06..dcbdc85c343b5a6ab603b0bae813fc69662deeb7 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/control-panel/control-panel.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/control-panel/control-panel.component.spec.ts
@@ -1,6 +1,7 @@
 import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideNoopAnimations} from '@angular/platform-browser/animations';
+import {provideRouter} from '@angular/router';
 
 import {ControlPanelComponent} from './control-panel.component';
 
@@ -11,7 +12,11 @@ describe('ControlPanelComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ControlPanelComponent],
-      providers: [provideMockStore({initialState: {}}), provideHttpClient()],
+      providers: [
+        provideHttpClient(),
+        provideRouter([]),
+        provideNoopAnimations(),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ControlPanelComponent);
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/hazard-data/hazard-data.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/hazard-data/hazard-data.component.spec.ts
index b82e6f9c6da2cad266cbc141500beec917c4eb13..b59cd9f4b8400fbd7d3cd9694af7c77edc83425d 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/hazard-data/hazard-data.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/hazard-data/hazard-data.component.spec.ts
@@ -1,7 +1,7 @@
 import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideRouter} from '@angular/router';
 
 import {HazardDataComponent} from './hazard-data.component';
 
@@ -13,9 +13,9 @@ describe('HazardDataComponent', () => {
     await TestBed.configureTestingModule({
       imports: [HazardDataComponent],
       providers: [
-        provideMockStore({initialState: {}}),
         provideHttpClient(),
         provideNoopAnimations(),
+        provideRouter([]),
       ],
     }).compileComponents();
 
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/parameter-summary/parameter-summary.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/parameter-summary/parameter-summary.component.spec.ts
index 10bfea4db08555fa96249b81d15dd82cba66a7b4..3642d0d1e9b31b6f64d0c505b3ad5a45af58edad 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/parameter-summary/parameter-summary.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/parameter-summary/parameter-summary.component.spec.ts
@@ -1,5 +1,7 @@
+import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideNoopAnimations} from '@angular/platform-browser/animations';
+import {provideRouter} from '@angular/router';
 
 import {ParameterSummaryComponent} from './parameter-summary.component';
 
@@ -10,7 +12,11 @@ describe('ParameterSummaryComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [ParameterSummaryComponent],
-      providers: [provideMockStore({initialState: {}})],
+      providers: [
+        provideHttpClient(),
+        provideNoopAnimations(),
+        provideRouter([]),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(ParameterSummaryComponent);
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts
index 444a23c17df0dbd51a4a3bd80357501eb395a58c..29446243669399ceb07960abe2eede6a9c3289c2 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plot-settings/plot-settings.component.spec.ts
@@ -1,6 +1,7 @@
+import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideRouter} from '@angular/router';
 
 import {PlotSettingsComponent} from './plot-settings.component';
 
@@ -12,8 +13,9 @@ describe('PlotSettingsComponent', () => {
     await TestBed.configureTestingModule({
       imports: [PlotSettingsComponent],
       providers: [
-        provideMockStore({initialState: {}}),
+        provideHttpClient(),
         provideNoopAnimations(),
+        provideRouter([]),
       ],
     }).compileComponents();
 
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.spec.ts
index e562e2d316dbc6e5c6968468fe2ecbe0b704f44f..df5874f64cde103957e857959fb56fc80181bef3 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/plots/plots.component.spec.ts
@@ -1,7 +1,7 @@
 import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideRouter} from '@angular/router';
 
 import {PlotsComponent} from './plots.component';
 
@@ -13,7 +13,7 @@ describe('PlotsComponent', () => {
     await TestBed.configureTestingModule({
       imports: [PlotsComponent],
       providers: [
-        provideMockStore({initialState: {}}),
+        provideRouter([]),
         provideHttpClient(),
         provideNoopAnimations(),
       ],
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.spec.ts
index 03edf5f3627fa03199db0bec9e2b59b424959f42..5206c02f20730b21c94e1a5c77da2ba58785472d 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.spec.ts
@@ -1,7 +1,7 @@
 import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
-import {provideMockStore} from '@ngrx/store/testing';
+import {provideRouter} from '@angular/router';
 
 import {SpectraDataComponent} from './spectra-data.component';
 
@@ -13,7 +13,7 @@ describe('SpectraDataComponent', () => {
     await TestBed.configureTestingModule({
       imports: [SpectraDataComponent],
       providers: [
-        provideMockStore({initialState: {}}),
+        provideRouter([]),
         provideHttpClient(),
         provideNoopAnimations(),
       ],
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.ts
index 44e977fed5eca498e092602d9307338b1bfd19e4..5ff462e08050f20bdeaa40413b29da30aa951919 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/spectra-data/spectra-data.component.ts
@@ -74,7 +74,13 @@ export class SpectraDataComponent {
 
   /** Table data for response spectra components */
   spectraComponentsTableData = computed(() => {
-    const imts = this.spectraImtRow(this.facade.serviceResponses());
+    const serviceResponses = this.facade.serviceResponses();
+
+    if (serviceResponses.modelA === null || serviceResponses.modelB === null) {
+      return [];
+    }
+
+    const imts = this.spectraImtRow(serviceResponses);
 
     const spectraFilter = (spectra: Spectra) =>
       spectra.sourceType !== SourceType.TOTAL;
@@ -98,6 +104,10 @@ export class SpectraDataComponent {
   spectraDiffTableData: Signal<TableData[]> = computed(() => {
     const serviceResponses = this.facade.serviceResponses();
 
+    if (serviceResponses.modelA === null || serviceResponses.modelB === null) {
+      return [];
+    }
+
     const spectraDiff = spectraPercentDifference(
       serviceResponses,
       this.facade.formGroup.getRawValue().returnPeriod
@@ -115,6 +125,11 @@ export class SpectraDataComponent {
   /** Table data for response spectra */
   spectraTotalTableData = computed(() => {
     const serviceResponses = this.facade.serviceResponses();
+
+    if (serviceResponses.modelA === null || serviceResponses.modelB === null) {
+      return [];
+    }
+
     const imts = this.spectraImtRow(serviceResponses);
 
     const spectraFilter = (spectra: Spectra) =>
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/table-data-panel/table-data-panel.component.spec.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/table-data-panel/table-data-panel.component.spec.ts
index 9f3bb55fb1641af9fca5736f4a189e397681f4c7..e55d98b55c4d156431cf20c42e74fb3e452327dc 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/table-data-panel/table-data-panel.component.spec.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/components/table-data-panel/table-data-panel.component.spec.ts
@@ -1,6 +1,7 @@
 import {provideHttpClient} from '@angular/common/http';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
+import {provideRouter} from '@angular/router';
 
 import {TableDataPanelComponent} from './table-data-panel.component';
 
@@ -11,7 +12,11 @@ describe('TableDataPanelComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [TableDataPanelComponent],
-      providers: [provideHttpClient(), provideNoopAnimations()],
+      providers: [
+        provideHttpClient(),
+        provideNoopAnimations(),
+        provideRouter([]),
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(TableDataPanelComponent);