diff --git a/app/javascript/mastodon/features/compose/containers/poll_button_container.js b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
index e8fa9798c56..5098d69cc73 100644
--- a/app/javascript/mastodon/features/compose/containers/poll_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
@@ -4,12 +4,10 @@ import { addPoll, removePoll } from '../../../actions/compose';
 import PollButton from '../components/poll_button';
 
 const mapStateToProps = state => {
-  const readyAttachmentsSize = state.compose.get('media_attachments').size ?? 0;
-  const hasAttachments = readyAttachmentsSize > 0 || !!state.compose.get('is_uploading');
   const hasQuote = !!state.compose.get('quoted_status_id');
 
   return ({
-    disabled: hasAttachments || hasQuote,
+    disabled: hasQuote,
     active: state.getIn(['compose', 'poll']) !== null,
   });
 };
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 9f82de40d3a..da1053595f8 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -190,7 +190,7 @@ class PostStatusService < BaseService
       return
     end
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > Status::MEDIA_ATTACHMENTS_LIMIT || @options[:poll].present?
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > Status::MEDIA_ATTACHMENTS_LIMIT
 
     @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:to_i))