diff --git a/app/src/main/java/de/itstall/freifunkfranken/view/MapsFragment.java b/app/src/main/java/de/itstall/freifunkfranken/view/MapsFragment.java
index b09201188a14b0cb9047480d3d99198c5dce5cd6..fa1c1549661cddf519e91603cd190bd83bd4b979 100644
--- a/app/src/main/java/de/itstall/freifunkfranken/view/MapsFragment.java
+++ b/app/src/main/java/de/itstall/freifunkfranken/view/MapsFragment.java
@@ -53,6 +53,8 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
     private ProgressDialog progressDialog = null;
     private LocationManager locationManager;
     private CustomLocationListener customLocationListener;
+    String locationProvider;
+
     private CustomLocationListenerInterface locationListener = new CustomLocationListenerInterface() {
         @Override
         public void onLocationChanged(Location location) {
@@ -104,8 +106,6 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
                 .getApplicationContext()
                 .getSystemService(Context.LOCATION_SERVICE);
 
-        String locationProvider = getEnabledLocationProvider();
-
         Dexter.withActivity((Activity) rootView.getContext())
                 .withPermissions(
                         Manifest.permission.ACCESS_FINE_LOCATION,
@@ -131,6 +131,9 @@ public class MapsFragment extends Fragment implements OnMapReadyCallback {
                                                                   .ACCESS_COARSE_LOCATION
                                                   ) == PackageManager.PERMISSION_GRANTED
                                           ) {
+                                              locationProvider = getEnabledLocationProvider();
+                                              
+                                              assert locationProvider != null;
                                               locationManager
                                                       .requestLocationUpdates(
                                                               locationProvider,
diff --git a/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java b/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
index ad511ad0b42ea84a15243e3796a00d396f2ebc03..e566e8959e3c04f185fbf36a6674c401aadd7678 100644
--- a/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
+++ b/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
@@ -43,6 +43,7 @@ public class NextApFragment extends Fragment implements NextApAdapter.OnItemClic
     private SharedPreferences sharedPreferences;
     private LocationManager locationManager;
     private List<AccessPoint> accessPointList;
+    private String locationProvider;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -67,8 +68,6 @@ public class NextApFragment extends Fragment implements NextApAdapter.OnItemClic
                 .getApplicationContext()
                 .getSystemService(Context.LOCATION_SERVICE);
 
-        String locationProvider = getEnabledLocationProvider();
-
         Dexter.withActivity((Activity) rootView.getContext())
                 .withPermissions(
                         Manifest.permission.ACCESS_FINE_LOCATION,
@@ -94,6 +93,9 @@ public class NextApFragment extends Fragment implements NextApAdapter.OnItemClic
                                                                   .ACCESS_COARSE_LOCATION
                                                   ) == PackageManager.PERMISSION_GRANTED
                                           ) {
+                                              locationProvider = getEnabledLocationProvider();
+
+                                              assert locationProvider != null;
                                               location = locationManager
                                                       .getLastKnownLocation(locationProvider);
                                           }