diff --git a/commons/res/xml/preferences.xml b/commons/res/xml/preferences.xml
index 802e60b6d..88c2e5b9b 100644
--- a/commons/res/xml/preferences.xml
+++ b/commons/res/xml/preferences.xml
@@ -7,6 +7,11 @@
         android:title="@string/preference_license"
         android:defaultValue="CC BY-SA"
         />
+    <CheckBoxPreference
+        android:title="Automatically get current location"
+        android:defaultValue="false"
+        android:summary="Retrieve your current location to offer category suggestions if an image is not geotagged."
+        android:key="allowGps" />
 
 
 </PreferenceScreen>
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
index ba04b2222..91c023f82 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
@@ -54,8 +54,8 @@ public class GPSExtractor {
             LocationManager locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
             Criteria criteria = new Criteria();
             String provider = locationManager.getBestProvider(criteria, true);
+
             myLocationListener = new MyLocationListener();
-            
             locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener);
             Location location = locationManager.getLastKnownLocation(provider);