diff --git a/Model/ContentItem.swift b/Model/ContentItem.swift
index 21f9eaba..2e370a02 100644
--- a/Model/ContentItem.swift
+++ b/Model/ContentItem.swift
@@ -35,12 +35,6 @@ struct ContentItem: Identifiable {
     }
 
     var contentType: ContentType {
-        if !playlist.isNil {
-            return .playlist
-        } else if !channel.isNil {
-            return .channel
-        }
-
-        return .video
+        video.isNil ? (channel.isNil ? .playlist : .channel) : .video
     }
 }
diff --git a/Shared/Player/VideoDetails.swift b/Shared/Player/VideoDetails.swift
index e0196f8d..a4b2dd70 100644
--- a/Shared/Player/VideoDetails.swift
+++ b/Shared/Player/VideoDetails.swift
@@ -87,9 +87,11 @@ struct VideoDetails: View {
             }
         }
         .onAppear {
-            if video.isNil {
-                currentPage = .queue
-            }
+            #if !os(macOS)
+                if video.isNil {
+                    currentPage = .queue
+                }
+            #endif
 
             guard video != nil, accounts.app.supportsSubscriptions else {
                 subscribed = false