diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
index b5998b52ca8..870cb415ff3 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
@@ -3,42 +3,45 @@
 @inherits BootstrapComponentBase
 
 <div @attributes="AdditionalAttributes" class="@ClassString">
-    <CascadingValue Value="@_editorItems" IsFixed="false">
-        @FieldItems?.Invoke(Model)
-    </CascadingValue>
-    <CascadingValue Value="this" Name="EditorForm">
-        <div class="form-body">
-            @if (ShowUnsetGroupItemsOnTop)
-            {
-                if (UnsetGroupItems.Any())
+    @if (Model != null)
+    {
+        <CascadingValue Value="@_editorItems" IsFixed="false">
+            @FieldItems?.Invoke(Model)
+        </CascadingValue>
+        <CascadingValue Value="this" Name="EditorForm">
+            <div class="form-body">
+                @if (ShowUnsetGroupItemsOnTop)
                 {
-                    @RenderUnsetGroupItems
+                    if (UnsetGroupItems.Any())
+                    {
+                        @RenderUnsetGroupItems
+                    }
+                    @foreach (var g in GroupItems)
+                    {
+                        @RenderGroupItems(g)
+                    }
                 }
-                @foreach (var g in GroupItems)
+                else
                 {
-                    @RenderGroupItems(g)
+                    @foreach (var g in GroupItems)
+                    {
+                        @RenderGroupItems(g)
+                    }
+                    if (UnsetGroupItems.Any())
+                    {
+                        @RenderUnsetGroupItems
+                    }
                 }
-            }
-            else
+            </div>
+
+            @if (Buttons != null)
             {
-                @foreach (var g in GroupItems)
-                {
-                    @RenderGroupItems(g)
-                }
-                if (UnsetGroupItems.Any())
-                {
-                    @RenderUnsetGroupItems
-                }
+                <div class="bb-editor-footer form-footer">
+                    @Buttons
+                </div>
             }
-        </div>
-
-        @if (Buttons != null)
-        {
-            <div class="bb-editor-footer form-footer">
-                @Buttons
-            </div>
-        }
-    </CascadingValue>
+        </CascadingValue>
+    }
 </div>
 
 @code
diff --git a/test/UnitTest/Components/EditorFormTest.cs b/test/UnitTest/Components/EditorFormTest.cs
index d62dd256453..5618645ba3f 100644
--- a/test/UnitTest/Components/EditorFormTest.cs
+++ b/test/UnitTest/Components/EditorFormTest.cs
@@ -51,13 +51,11 @@ public void CascadedEditContext_Ok()
     [Fact]
     public void Model_Error()
     {
-        Assert.ThrowsAny<ArgumentNullException>(() =>
+        var cut = Context.RenderComponent<EditorForm<Foo>>(pb =>
         {
-            Context.RenderComponent<EditorForm<Foo>>(pb =>
-            {
-                pb.Add(a => a.Model, null);
-            });
+            pb.Add(a => a.Model, null);
         });
+        Assert.Equal("<div class=\"bb-editor\"></div>", cut.Markup);
     }
 
     [Fact]