diff --git a/app/src/main/java/org/opus/beacon/MapActivity.java b/app/src/main/java/org/opus/beacon/MapActivity.java
index b6ba1ae..3edc353 100644
--- a/app/src/main/java/org/opus/beacon/MapActivity.java
+++ b/app/src/main/java/org/opus/beacon/MapActivity.java
@@ -121,6 +121,10 @@ private void setUpMap() {
 
         mLocationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
 
+        requestGPSUpdates();
+    }
+
+    private void requestGPSUpdates() {
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) !=
                 PackageManager.PERMISSION_GRANTED) {
 
@@ -128,14 +132,10 @@ private void setUpMap() {
                     new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
                     ACCESS_FINE_LOCATION_TAG);
         } else {
-            requestGPSUpdates();
+            mLocationManager.requestLocationUpdates(mLocationManager.GPS_PROVIDER, 1000, 1, this);
         }
     }
 
-    private void requestGPSUpdates() {
-        mLocationManager.requestLocationUpdates(mLocationManager.GPS_PROVIDER, 1000, 1, this);
-    }
-
     public void toastError(String err) {
         Toast toast = Toast.makeText(context, err, Toast.LENGTH_SHORT);
         TextView v = (TextView) toast.getView().findViewById(android.R.id.message);