diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml
index f65d02225..55acd399e 100644
--- a/res/menu/text_secure_normal.xml
+++ b/res/menu/text_secure_normal.xml
@@ -16,10 +16,10 @@
     <item android:title="@string/menu_deaddrop"
           android:id="@+id/menu_deaddrop" />
 
+    <item android:title="@string/menu_show_global_map"
+          android:id="@+id/menu_global_map" />
+
     <item android:title="@string/menu_settings"
           android:id="@+id/menu_settings" />
 
-    <item android:title="@string/menu_show_global_map"
-        android:id="@+id/menu_global_map" />
-
 </menu>
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index cf43d9cca..396a88ca4 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.search.SearchFragment;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.Prefs;
 
 import static org.thoughtcrime.securesms.map.MapDataManager.ALL_CHATS_GLOBAL_MAP;
 
@@ -92,6 +93,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
     inflater.inflate(R.menu.text_secure_normal, menu);
 
+    if (!Prefs.isLocationStreamingEnabled(this)) {
+      menu.findItem(R.id.menu_global_map).setVisible(false);
+    }
+
     super.onPrepareOptionsMenu(menu);
     return true;
   }