diff --git a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
index 029d162573..c647f6e410 100644
--- a/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
+++ b/src/components/views/elements/SpellCheckLanguagesDropdown.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 
 import Dropdown from "../../views/elements/Dropdown"
 import * as sdk from '../../../index';
-import * as languageHandler from '../../../languageHandler';
+import PlatformPeg from "../../../PlatformPeg";
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from "../../../languageHandler";
 
@@ -52,23 +52,26 @@ export default class SpellCheckLanguagesDropdown extends React.Component<SpellCh
     }
 
     componentDidMount() {
-        languageHandler.getAvailableSpellCheckLanguages().then((languages) => {
-            languages.sort(function(a, b) {
-                if (a < b) return -1;
-                if (a > b) return 1;
-                return 0;
-            });
-            const langs = [];
-            languages.forEach((language) => {
-                langs.push({
-                    label: language,
-                    value: language,
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.getAvailableSpellCheckLanguages().then((languages) => {
+                languages.sort(function(a, b) {
+                    if (a < b) return -1;
+                    if (a > b) return 1;
+                    return 0;
+                });
+                const langs = [];
+                languages.forEach((language) => {
+                    langs.push({
+                        label: language,
+                        value: language,
+                    })
                 })
-            })
-            this.setState({languages: langs});
-        }).catch((e) => {
-            this.setState({languages: ['en']});
-        });
+                this.setState({languages: langs});
+            }).catch((e) => {
+                this.setState({languages: ['en']});
+            });
+        }
     }
 
     _onSearchChange(search) {
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index febbcc8e36..e87dca88c8 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -188,7 +188,10 @@ export default class GeneralUserSettingsTab extends React.Component {
         SettingsStore.setValue("spell-check-languages", null, SettingLevel.DEVICE, languages);
         this.setState({spellCheckLanguages: languages});
 
-        languageHandler.setSpellCheckLanguages(languages);
+        const plaf = PlatformPeg.get();
+        if (plaf) {
+            plaf.setSpellCheckLanguages(languages);
+        }
     };
 
     _onPasswordChangeError = (err) => {
@@ -402,6 +405,7 @@ export default class GeneralUserSettingsTab extends React.Component {
     render() {
         const plaf = PlatformPeg.get();
         const supportsMultiLanguageSpellCheck = plaf.supportsMultiLanguageSpellCheck();
+        console.log("LOG", supportsMultiLanguageSpellCheck);
 
         const discoWarning = this.state.requiredPolicyInfo.hasTerms
             ? <img className='mx_GeneralUserSettingsTab_warningIcon'
diff --git a/src/languageHandler.tsx b/src/languageHandler.tsx
index 985719fce7..b61f57d4b3 100644
--- a/src/languageHandler.tsx
+++ b/src/languageHandler.tsx
@@ -346,20 +346,6 @@ export function setLanguage(preferredLangs: string | string[]) {
     });
 }
 
-export function setSpellCheckLanguages(preferredLangs: string[]) {
-    const plaf = PlatformPeg.get();
-    if (plaf) {
-        plaf.setSpellCheckLanguages(preferredLangs);
-    }
-}
-
-export async function getAvailableSpellCheckLanguages(): Promise<string[]> {
-    const plaf = PlatformPeg.get();
-    if (plaf) {
-        return plaf.getAvailableSpellCheckLanguages();
-    }
-}
-
 export function getAllLanguagesFromJson() {
     return getLangsJson().then((langsObject) => {
         const langs = [];