diff --git a/projects/components/src/spinner/spinner.component.test.ts b/projects/components/src/spinner/spinner.component.test.ts
index 46d960b5e..4f9a88842 100644
--- a/projects/components/src/spinner/spinner.component.test.ts
+++ b/projects/components/src/spinner/spinner.component.test.ts
@@ -35,7 +35,7 @@ describe('Spinner component', () => {
         }
       });
 
-      expectObservable(spectator.component.state$!).toBe('(y)', { y: 'loading' });
+      expectObservable(spectator.component.state$).toBe('(y)', { y: 'loading' });
     });
   }));
 
@@ -52,7 +52,7 @@ describe('Spinner component', () => {
         }
       );
 
-      expectObservable(spectator.component.state$!).toBe('(x-y|)', { x: 'loading', y: 'success' });
+      expectObservable(spectator.component.state$).toBe('(x-y|)', { x: 'loading', y: 'success' });
     });
   }));
 
@@ -69,7 +69,7 @@ describe('Spinner component', () => {
         }
       );
 
-      expectObservable(spectator.component.state$!).toBe('(x-y|)', { x: 'loading', y: 'error' });
+      expectObservable(spectator.component.state$).toBe('(x-y|)', { x: 'loading', y: 'error' });
     });
   }));
 });
diff --git a/projects/components/src/spinner/spinner.component.ts b/projects/components/src/spinner/spinner.component.ts
index d263f6f38..b113200a0 100644
--- a/projects/components/src/spinner/spinner.component.ts
+++ b/projects/components/src/spinner/spinner.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
 import { IconType } from '@hypertrace/assets-library';
 import { TypedSimpleChanges } from '@hypertrace/common';
-import { Observable, of } from 'rxjs';
+import { NEVER, Observable, of } from 'rxjs';
 import { catchError, endWith, ignoreElements, startWith } from 'rxjs/operators';
 import { IconSize } from '../icon/icon-size';
 
@@ -50,11 +50,11 @@ export class SpinnerComponent implements OnChanges {
   @Input()
   public theme: SpinnerTheme = SpinnerTheme.Light;
 
-  public state$?: Observable<SpinnerAsyncState>;
+  public state$: Observable<SpinnerAsyncState> = of(SpinnerAsyncState.Loading);
 
   public ngOnChanges(changes: TypedSimpleChanges<this>): void {
-    if (changes.data$ && this.data$) {
-      this.state$ = this.mapObservableState(this.data$);
+    if (changes.data$) {
+      this.state$ = this.mapObservableState(this.data$ ?? NEVER);
     }
   }