diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
index 0efefc17efc..8d22da2e305 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityLoader.java
@@ -11,7 +11,6 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.system.Os;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -113,14 +112,6 @@ class QtActivityLoader extends QtLoader {
                 String extraAppParams = extras.getString("extraappparams");
                 appendApplicationParameters(getDecodedUtfString(extraAppParams));
             }
-
-            m_debuggerSleepMs = 3000;
-            if (Os.getenv("QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS") != null) {
-                try {
-                   m_debuggerSleepMs = Integer.parseInt(Os.getenv("QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS"));
-                } catch (NumberFormatException ignored) {
-                }
-            }
         } else {
             Log.d(QtNative.QtTAG, "Not in debug mode! It is not allowed to use extra arguments " +
                     "in non-debug mode.");
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
index f0d5d09eee3..bab9ff1d575 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtLoader.java
@@ -17,6 +17,8 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Debug;
+import android.system.Os;
 import android.util.Log;
 
 import java.io.File;
@@ -47,8 +49,6 @@ abstract class QtLoader {
     protected String m_applicationParameters = "";
     protected HashMap<String, String> m_environmentVariables = new HashMap<>();
 
-    protected int m_debuggerSleepMs = 0;
-
     protected static QtLoader m_instance = null;
     protected boolean m_librariesLoaded;
 
@@ -440,11 +440,23 @@ abstract class QtLoader {
         ArrayList<String> nativeLibraries = getQtLibrariesList();
         nativeLibraries.addAll(getLocalLibrariesList());
 
-        if (m_debuggerSleepMs > 0) {
-            Log.i(QtTAG, "Sleeping for " + m_debuggerSleepMs +
-                         "ms, helping the native debugger to settle. " +
-                         "Use the env QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS variable to change this value.");
-            QtNative.getQtThread().sleep(m_debuggerSleepMs);
+        if (Debug.isDebuggerConnected()) {
+            final String debuggerSleepEnvVarName = "QT_ANDROID_DEBUGGER_MAIN_THREAD_SLEEP_MS";
+            int debuggerSleepMs = 3000;
+            if (Os.getenv(debuggerSleepEnvVarName) != null) {
+                try {
+                   debuggerSleepMs = Integer.parseInt(Os.getenv(debuggerSleepEnvVarName));
+                } catch (NumberFormatException ignored) {
+                }
+            }
+
+            if (debuggerSleepMs > 0) {
+                Log.i(QtTAG, "Sleeping for " + debuggerSleepMs +
+                             "ms, helping the native debugger to settle. " +
+                             "Use the env " + debuggerSleepEnvVarName +
+                             " variable to change this value.");
+                QtNative.getQtThread().sleep(debuggerSleepMs);
+            }
         }
 
         if (!loadLibraries(nativeLibraries)) {