diff --git a/Mastodon/Scene/Settings/Cell/SettingsToggleTableViewCell.swift b/Mastodon/Scene/Settings/Cell/SettingsToggleTableViewCell.swift
index 4926dbfce..05d5ecea2 100644
--- a/Mastodon/Scene/Settings/Cell/SettingsToggleTableViewCell.swift
+++ b/Mastodon/Scene/Settings/Cell/SettingsToggleTableViewCell.swift
@@ -86,7 +86,7 @@ extension SettingsToggleTableViewCell {
                 return nil
             default:
                 // set tint black for Light Mode
-                return self.contentView.window?.tintColor ?? nil
+                return self.contentView.window?.tintColor
             }
         }()
     }
diff --git a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift
index 416226cbb..bb866331b 100644
--- a/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift
+++ b/MastodonSDK/Sources/MastodonUI/View/Content/StatusView+ViewModel.swift
@@ -468,7 +468,7 @@ extension StatusView.ViewModel {
             pollCountdownDescription
         )
         .sink { pollVoteDescription, pollCountdownDescription in
-            statusView.pollVoteCountLabel.text = pollVoteDescription ?? "-"
+            statusView.pollVoteCountLabel.text = pollVoteDescription
             statusView.pollCountdownLabel.text = pollCountdownDescription ?? "-"
         }
         .store(in: &disposeBag)