diff --git a/traccar-client/src/main/java/org/traccar/client/TraccarActivity.java b/traccar-client/src/main/java/org/traccar/client/TraccarActivity.java
index a245ca0..60d5ac4 100644
--- a/traccar-client/src/main/java/org/traccar/client/TraccarActivity.java
+++ b/traccar-client/src/main/java/org/traccar/client/TraccarActivity.java
@@ -50,6 +50,9 @@ public class TraccarActivity extends PreferenceActivity {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
+        SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
+        if (sharedPreferences.getBoolean(KEY_STATUS, false))
+            startService(new Intent(this, TraccarService.class));
     }
 
     @Override
@@ -122,8 +125,6 @@ public class TraccarActivity extends PreferenceActivity {
             sharedPreferences.edit().putString(KEY_ID, id).commit();
         }
         findPreference(KEY_ID).setSummary(sharedPreferences.getString(KEY_ID, id));
-
-        sharedPreferences.edit().putBoolean(KEY_STATUS, isServiceRunning()).commit();
     }
 
 }