diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java
index f5b9778cbad287d0de4ebea39d631d860cf69bff..f784ce80196cf74668d4c947416c9493ef96e3c2 100644
--- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java
+++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java
@@ -308,4 +308,8 @@ public class GPSTracker extends Service implements LocationListener {
             );
         }
     }
+
+    public void removeGPSUpdates(){
+        locationManager.removeUpdates(this);
+    }
 }
\ No newline at end of file
diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
index d6e0fc5ec4e69b6081714ca92bb66a67955a4b98..ccb4b040e936287ce4f014df0929c36ed45d79c4 100644
--- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
+++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java
@@ -333,4 +333,14 @@ public class Location {
             locationData.requestGPSUpdates();
         }
     }
+
+    public void removeGPSUpdates(){
+        if (locationData == null) {
+            // Will call requestLocationUpdates
+            locationData = new GPSTracker(main);
+        }
+        else {
+            locationData.removeGPSUpdates();
+        }
+    }
 }
diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java
index bece45e5a7e35f33cbc3926de38ca2889fa15607..907bb5fce2467d983948be41f7f4c6e1c44cfcdb 100644
--- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java
+++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java
@@ -298,6 +298,8 @@ public class MainActivity extends BaseActivity implements Scan.DetectionListener
 */
         NotificationHelper.cancelDetectionAlertStatusNotification(getApplicationContext());
 
+        locationFinder.removeGPSUpdates();
+
         detector.stopIO(); // release audio resources from the scanner
         Spoofer spoof = Spoofer.getInstance(); //get a spoofing object
         spoof.stopSpoofingComplete(); //stop the whole spoofing process