diff --git a/src/ReactiveUI.Blazor/ReactiveComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
index 4648fa5d0e..f8ef575029 100644
--- a/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
+++ b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
@@ -39,6 +39,7 @@ public ReactiveComponentBase()
         {
             this.WhenAnyValue(x => x.ViewModel).Subscribe(_ => StateHasChanged());
             var viewModelsPropertyChanged = this.WhenAnyValue(x => x.ViewModel)
+                .Where(x => x != null)
                 .Select(x => Observable.FromEvent<PropertyChangedEventHandler, Unit>(
                     eventHandler =>
                     {
diff --git a/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
index 2cefc08725..b73b443993 100644
--- a/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
+++ b/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
@@ -35,6 +35,7 @@ public ReactiveLayoutComponentBase()
         {
             this.WhenAnyValue(x => x.ViewModel).Subscribe(_ => StateHasChanged());
             var viewModelsPropertyChanged = this.WhenAnyValue(x => x.ViewModel)
+                .Where(x => x != null)
                 .Select(x => Observable.FromEvent<PropertyChangedEventHandler, Unit>(
                     eventHandler =>
                     {