diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
index 42fa9d51256..f629e56e3e0 100644
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -684,10 +684,9 @@ OnSharedPreferenceChangeListener
                     preferences.removePreference(pref);
                     i--;
                     continue;
-                } else if (AppConstants.RELEASE_BUILD &&
-                            (PREFS_GEO_REPORTING.equals(key) ||
-                             PREFS_GEO_LEARN_MORE.equals(key))) {
-                    // We don't build wifi/cell tower collection in release builds, so hide the UI.
+                } else if (!AppConstants.MOZ_STUMBLER_BUILD_TIME_ENABLED &&
+                           (PREFS_GEO_REPORTING.equals(key) ||
+                            PREFS_GEO_LEARN_MORE.equals(key))) {
                     preferences.removePreference(pref);
                     i--;
                     continue;