diff --git a/Model/CommentsModel.swift b/Model/CommentsModel.swift
index 7c553072..9f9a5191 100644
--- a/Model/CommentsModel.swift
+++ b/Model/CommentsModel.swift
@@ -15,7 +15,7 @@ final class CommentsModel: ObservableObject {
     var player: PlayerModel!
 
     static var enabled: Bool {
-        !Defaults[.commentsInstanceID].isNil
+        !Defaults[.commentsInstanceID].isNil && !Defaults[.commentsInstanceID]!.isEmpty
     }
 
     var nextPageAvailable: Bool {
diff --git a/Shared/Settings/ServicesSettings.swift b/Shared/Settings/ServicesSettings.swift
index 02125638..10ae9dcf 100644
--- a/Shared/Settings/ServicesSettings.swift
+++ b/Shared/Settings/ServicesSettings.swift
@@ -59,7 +59,7 @@ struct ServicesSettings: View {
 
     private var commentsInstancePicker: some View {
         Picker("Comments", selection: $commentsInstanceID) {
-            Text("Disabled").tag(String?.none)
+            Text("Disabled").tag(Optional(""))
 
             ForEach(InstancesModel.all.filter { $0.app.supportsComments }) { instance in
                 Text(instance.description).tag(Optional(instance.id))