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 85ad1ebf95b3574593171cb549e0c54e39f9ba50..ebbab418f5f8d47373115e0cacfd72c93feaac66 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
@@ -945,9 +945,10 @@ public class MainActivity extends BaseActivity implements Scan.DetectionListener
 
         if (locationTrack) {
             lastPosition = locationFinder.getLocation(); //get the latest position
+            locationFinder.saveLocationGPSTrackerObject();
         }
 
-        locationFinder.saveLocationGPSTrackerObject();
+
         if (this.getSettingsObject().getBoolean(ConfigConstants.SETTING_CONTINOUS_SPOOFING, false)) { //check if the settings are set to continous spoofing
             /*if (!this.getBackgroundStatus()) { //if the app is not in the background
                 this.cancelDetectionNotification(); //cancel the detection notification