diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index cad14c3f731e05e9d1ff0d011173a90e4537a1db..5ff55f15e9d32531557f0cfc17b9684f67823e0d 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -153,6 +153,7 @@ const intlMessages = defineMessages({
 const CHAT_ENABLED = Meteor.settings.public.chat.enabled;
 const MAX_CUSTOM_FIELDS = Meteor.settings.public.poll.max_custom;
 const MAX_INPUT_CHARS = 45;
+const FILE_DRAG_AND_DROP_ENABLED = Meteor.settings.public.poll.allowDragAndDropFile;
 
 const validateInput = (i) => {
   let _input = i;
@@ -535,7 +536,7 @@ class Poll extends Component {
                         }}
                       />
                       {
-                        this.renderDragDrop()
+                        FILE_DRAG_AND_DROP_ENABLED && this.renderDragDrop()
                       }
                     </div>
                     )
diff --git a/bigbluebutton-html5/private/config/settings.yml b/bigbluebutton-html5/private/config/settings.yml
index aecbbbf6a1bcd9b760d7635614713a00a67ea309..8461741347f080f110d0bb23f84a8896c988d4a2 100755
--- a/bigbluebutton-html5/private/config/settings.yml
+++ b/bigbluebutton-html5/private/config/settings.yml
@@ -288,6 +288,7 @@ public:
   poll:
     enabled: true
     max_custom: 5
+    allowDragAndDropFile: false
   captions:
     enabled: true
     enableDictation: false