diff --git a/app/src/main/java/foundation/e/advancedprivacy/AdvancedPrivacyApplication.kt b/app/src/main/java/foundation/e/advancedprivacy/AdvancedPrivacyApplication.kt
index 9fbda7a13cf79edf238e7efa751766980a3b7d2c..74a69368c9ff4e2fc026cce1bf44807a3c32e63f 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/AdvancedPrivacyApplication.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/AdvancedPrivacyApplication.kt
@@ -28,6 +28,7 @@ import foundation.e.advancedprivacy.domain.usecases.TrackersStateUseCase
 import foundation.e.advancedprivacy.domain.usecases.TrackersStatisticsUseCase
 import foundation.e.advancedprivacy.domain.usecases.VpnSupervisorUseCase
 import foundation.e.advancedprivacy.domain.usecases.WeeklyReportUseCase
+import foundation.e.advancedprivacy.ipscrambler.OrbotSupervisor
 import foundation.e.advancedprivacy.trackers.data.TrackersRepository
 import foundation.e.advancedprivacy.trackers.services.UpdateTrackersWorker
 import foundation.e.lib.telemetry.Telemetry
@@ -54,6 +55,10 @@ class AdvancedPrivacyApplication : Application() {
             modules(appModule)
         }
 
+        // Fix 3386 : Initialize OrbotSupervisor, to make sure all Orbot is waked up before
+        // OrbotService may be started by the system.
+        val orbotSupervisor = get<OrbotSupervisor>(OrbotSupervisor::class.java)
+
         get<CoroutineScope>(CoroutineScope::class.java).launch {
             initBackgroundSingletons()
         }
diff --git a/ipscrambling/src/main/AndroidManifest.xml b/ipscrambling/src/main/AndroidManifest.xml
index 7a64471f19e90362e97205d96b16dd1ed1ea95b6..1cd4e26652bf643ea42ac1d7103c8dcf1d821642 100644
--- a/ipscrambling/src/main/AndroidManifest.xml
+++ b/ipscrambling/src/main/AndroidManifest.xml
@@ -20,6 +20,10 @@
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
+            <meta-data
+                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+                android:value="false"
+                />
         </service>
     </application>
 </manifest>