diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/component.jsx
index a35217a1220666195221499febcf51512d2f9e44..388ce1c48f4e3147d689c1262dae82583b749054 100644
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/annotations/text/component.jsx
@@ -60,13 +60,14 @@ export default class TextDrawComponent extends Component {
     // that's why we have a separate case for iOS - we don't focus here automatically
     // but we focus on the next "tap" invoked by a user
     const iOS = ['iPad', 'iPhone', 'iPod'].indexOf(navigator.platform) >= 0;
+    const Android = ['Android'].indexOf(navigator.platform) >= 0;
 
     // unsupported Firefox condition (not iOS though) can be removed when FF 59 is released
     // see https://bugzilla.mozilla.org/show_bug.cgi?id=1409113
     const unsupportedFirefox = navigator.userAgent.indexOf('Firefox/57') !== -1
                             || navigator.userAgent.indexOf('Firefox/58') !== -1;
 
-    if (iOS || unsupportedFirefox) { return; }
+    if (iOS || (Android && unsupportedFirefox)) { return; }
 
     if (this.props.isActive && this.props.annotation.status !== DRAW_END) {
       this.handleFocus();
@@ -183,6 +184,7 @@ export default class TextDrawComponent extends Component {
             onChange={this.onChangeHandler}
             onBlur={this.handleOnBlur}
             style={styles}
+            spellCheck="false"
           />
         </foreignObject>
       </g>