diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 67ed66ef78..ba2f5c7606 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -79,6 +79,7 @@
       android:resizeableActivity="true"
       android:supportsRtl="true"
       android:networkSecurityConfig="@xml/network_security_config"
+      android:manageSpaceActivity="${applicationId}.ManageSpaceActivity"
       tools:targetApi="33">
 
     <!-- Allows for config and orientation change without killing/restarting main activity -->
@@ -362,6 +363,11 @@
         android:configChanges="uiMode"
         android:windowSoftInputMode="stateAlwaysHidden|adjustPan"/>
 
+    <activity-alias
+        android:name="${applicationId}.ManageSpaceActivity"
+        android:exported="true"
+        android:targetActivity=".SplashActivity" />
+
     <activity
         android:name="app.organicmaps.downloader.DownloaderActivity"
         android:configChanges="orientation|screenLayout|screenSize"
diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java
index 6ba79d2dc5..7f4ae291a9 100644
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -19,6 +19,7 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatActivity;
 
 import app.organicmaps.display.DisplayManager;
+import app.organicmaps.downloader.DownloaderActivity;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.util.Config;
@@ -178,7 +179,13 @@ public class SplashActivity extends AppCompatActivity
     // Re-use original intent with the known safe subset of flags to retain security permissions.
     // https://github.com/organicmaps/organicmaps/issues/6944
     final Intent intent = Objects.requireNonNull(getIntent());
-    intent.setComponent(new ComponentName(this, DownloadResourcesLegacyActivity.class));
+
+    if (isManageSpaceActivity(intent)) {
+      intent.setComponent(new ComponentName(this, DownloaderActivity.class));
+    } else {
+      intent.setComponent(new ComponentName(this, DownloadResourcesLegacyActivity.class));
+    }
+
     // FLAG_ACTIVITY_NEW_TASK and FLAG_ACTIVITY_RESET_TASK_IF_NEEDED break the cold start.
     // https://github.com/organicmaps/organicmaps/pull/7287
     // FORWARD_RESULT_FLAG conflicts with the ActivityResultLauncher.
@@ -196,4 +203,15 @@ public class SplashActivity extends AppCompatActivity
     startActivity(intent);
     finish();
   }
+
+  private boolean isManageSpaceActivity(Intent intent) {
+    var component = intent.getComponent();
+
+    if (!Intent.ACTION_VIEW.equals(intent.getAction())) return false;
+    if (component == null) return false;
+
+    var manageSpaceActivityName = BuildConfig.APPLICATION_ID + ".ManageSpaceActivity";
+
+    return manageSpaceActivityName.equals(component.getClassName());
+  }
 }