diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 06edd36b8d5..ef302a7d3bb 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1384,21 +1384,23 @@ class="table table-striped snipe-table"
                         </div> <!-- /.row -->
                     </div> <!-- /.tab-pane files -->
 
-                    @can('view', $asset->model)
-                    <div class="tab-pane fade" id="modelfiles">
-                        <div class="row{{ (($asset->model) && ($asset->model->uploads->count() > 0)) ? '' : ' hidden-print' }}">
-                            <div class="col-md-12">
-
-                                <x-filestable
-                                        filepath="private_uploads/assetmodels/"
-                                        showfile_routename="show/modelfile"
-                                        deletefile_routename="delete/modelfile"
-                                        :object="$asset->model" />
-
-                            </div> <!-- /.col-md-12 -->
-                        </div> <!-- /.row -->
-                    </div> <!-- /.tab-pane files -->
-                    @endcan
+                    @if ($asset->model)
+                        @can('view', $asset->model)
+                            <div class="tab-pane fade" id="modelfiles">
+                                <div class="row{{ (($asset->model) && ($asset->model->uploads->count() > 0)) ? '' : ' hidden-print' }}">
+                                    <div class="col-md-12">
+
+                                        <x-filestable
+                                                filepath="private_uploads/assetmodels/"
+                                                showfile_routename="show/modelfile"
+                                                deletefile_routename="delete/modelfile"
+                                                :object="$asset->model" />
+
+                                    </div> <!-- /.col-md-12 -->
+                                </div> <!-- /.row -->
+                            </div> <!-- /.tab-pane files -->
+                        @endcan
+                    @endif
             </div><!-- /.tab-content -->
         </div><!-- nav-tabs-custom -->
     </div>
@@ -1420,4 +1422,4 @@ class="table table-striped snipe-table"
                 </script>
     @include ('partials.bootstrap-table')
 
-@stop
\ No newline at end of file
+@stop
diff --git a/tests/Feature/Assets/Ui/ShowAssetTest.php b/tests/Feature/Assets/Ui/ShowAssetTest.php
new file mode 100644
index 00000000000..23b6c8f31e6
--- /dev/null
+++ b/tests/Feature/Assets/Ui/ShowAssetTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Feature\Assets\Ui;
+
+use App\Models\Asset;
+use App\Models\User;
+use Tests\TestCase;
+
+class ShowAssetTest extends TestCase
+{
+    public function testPageForAssetWithMissingModelStillRenders()
+    {
+        $asset = Asset::factory()->create();
+
+        $asset->model_id = null;
+        $asset->forceSave();
+
+        $asset->refresh();
+
+        $this->assertNull($asset->fresh()->model_id, 'This test needs model_id to be null to be helpful.');
+
+        $this->actingAs(User::factory()->superuser()->create())
+            ->get(route('hardware.show', $asset))
+            ->assertOk();
+    }
+}