diff --git a/src/components/views/rooms/MessageComposer.tsx b/src/components/views/rooms/MessageComposer.tsx
index da7e3ac63bc..e553fb26aca 100644
--- a/src/components/views/rooms/MessageComposer.tsx
+++ b/src/components/views/rooms/MessageComposer.tsx
@@ -284,7 +284,10 @@ export default class MessageComposer extends React.Component<IProps, IState> {
             isMenuOpen: false,
             showStickers: false,
             showStickersButton: SettingsStore.getValue("MessageComposerInput.showStickersButton"),
-            showLocationButton: SettingsStore.getValue("MessageComposerInput.showLocationButton"),
+            showLocationButton: (
+                !window.electron &&
+                SettingsStore.getValue("MessageComposerInput.showLocationButton")
+            ),
         };
 
         this.instanceId = instanceCount++;
@@ -340,8 +343,10 @@ export default class MessageComposer extends React.Component<IProps, IState> {
 
                     case "MessageComposerInput.showLocationButton":
                     case "feature_location_share": {
-                        const showLocationButton = SettingsStore.getValue(
-                            "MessageComposerInput.showLocationButton");
+                        const showLocationButton = (
+                            !window.electron &&
+                            SettingsStore.getValue("MessageComposerInput.showLocationButton")
+                        );
 
                         if (this.state.showLocationButton !== showLocationButton) {
                             this.setState({ showLocationButton });
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 5b35d17eeba..c10b07d4801 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -307,7 +307,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
     getShowLocationIfEnabled(): string[] {
         // TODO: when location sharing is out of labs, this can be deleted and
         //       we can just add this to COMPOSER_SETTINGS
-        if (SettingsStore.getValue("feature_location_share")) {
+        if (!window.electron && SettingsStore.getValue("feature_location_share")) {
             return ['MessageComposerInput.showLocationButton'];
         } else {
             return [];