diff --git a/app/src/main/java/com/xypower/mpapp/MainActivity.java b/app/src/main/java/com/xypower/mpapp/MainActivity.java
index 921cf803..7e33e5cd 100644
--- a/app/src/main/java/com/xypower/mpapp/MainActivity.java
+++ b/app/src/main/java/com/xypower/mpapp/MainActivity.java
@@ -180,25 +180,27 @@ public class MainActivity extends AppCompatActivity {
 
 
         if (MicroPhotoContext.hasMpAppConfig(appContext)) {
-            Runnable runnable = new Runnable() {
+            final Runnable runnable = new Runnable() {
                 @Override
                 public void run() {
 
                     if (!MicroPhotoService.isRunning && !TextUtils.isEmpty(appConfig.cmdid) && !TextUtils.isEmpty(appConfig.server) && appConfig.port != 0) {
                         if (binding.btnStartServ.isEnabled()) {
+                            Log.i(TAG, "Perform AutoStart");
                             binding.btnStartServ.performClick();
                         }
                     }
                 }
             };
 
+            long timeout = 500;
+            if (SystemClock.elapsedRealtime() < 180000) {
+                // In 3 minutes
+                timeout = 10000;  // in 10 seconds
+            }
             Handler handler = new Handler();
-            long boottime = SystemClock.elapsedRealtime();
-            Log.i(TAG, "System boot time =" + boottime );
-            if(boottime <= 60000)
-                handler.postDelayed(runnable, 15000);
-            else
-                handler.postDelayed(runnable, 500);
+            handler.postDelayed(runnable, timeout);
+            Log.i(TAG, "Set AutoStart after " + Long.toString(timeout) + "ms");
         }
     }
 
@@ -238,6 +240,7 @@ public class MainActivity extends AppCompatActivity {
 
                 startMicroPhotoService(appContext, curAppConfig, mMessenger);
 
+                Log.i(TAG, "Service auto-started");
                 binding.btnStartServ.setEnabled(false);
                 binding.btnStopServ.setEnabled(true);
             }