diff --git a/Packages/Status/Sources/Status/Editor/Components/StatusEditorAccessoryView.swift b/Packages/Status/Sources/Status/Editor/Components/StatusEditorAccessoryView.swift
index 11b74018..f6323dbe 100644
--- a/Packages/Status/Sources/Status/Editor/Components/StatusEditorAccessoryView.swift
+++ b/Packages/Status/Sources/Status/Editor/Components/StatusEditorAccessoryView.swift
@@ -39,6 +39,7 @@ struct StatusEditorAccessoryView: View {
             Button {
               withAnimation {
                 viewModel.showPoll.toggle()
+                viewModel.resetPollDefaults()
               }
             } label: {
               Image(systemName: "chart.bar")
diff --git a/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift b/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
index 6c591d16..9355b880 100644
--- a/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
+++ b/Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
@@ -99,7 +99,7 @@ public class StatusEditorViewModel: NSObject, ObservableObject {
   }
 
   var shouldDisablePollButton: Bool {
-    showPoll || !selectedMedias.isEmpty
+    !selectedMedias.isEmpty
   }
 
   var shouldDisplayDismissWarning: Bool {