diff --git a/Model/Watch.swift b/Model/Watch.swift
index 75eefcc8..27ca8edc 100644
--- a/Model/Watch.swift
+++ b/Model/Watch.swift
@@ -100,6 +100,6 @@ extension Watch {
             }
         }
 
-        return Video(app: app ?? AccountsModel.shared.current.app ?? .local, instanceURL: instanceURL, videoID: videoID)
+        return Video(app: app ?? AccountsModel.shared.current?.app ?? .local, instanceURL: instanceURL, videoID: videoID)
     }
 }