diff --git a/src/main/java/com/topjohnwu/magisk/MagiskManager.java b/src/main/java/com/topjohnwu/magisk/MagiskManager.java
index 90e7e370d..a9c9a2dae 100644
--- a/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+++ b/src/main/java/com/topjohnwu/magisk/MagiskManager.java
@@ -106,9 +106,9 @@ public class MagiskManager extends Shell.ContainerApp {
             @Override
             public void onRootShellInit(@NonNull Shell shell) {
                 try (InputStream utils = getAssets().open(Const.UTIL_FUNCTIONS);
-                     InputStream sudb = getResources().openRawResource(R.raw.magiskdb)) {
+                     InputStream magiskDB = getResources().openRawResource(R.raw.magiskdb)) {
                     shell.loadInputStream(null, null, utils);
-                    shell.loadInputStream(null, null, sudb);
+                    shell.loadInputStream(null, null, magiskDB);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
@@ -140,7 +140,6 @@ public class MagiskManager extends Shell.ContainerApp {
             mDB = MagiskDatabaseHelper.getInstance(this);
         }
 
-        repoDB = new RepoDatabaseHelper(this);
         defaultLocale = Locale.getDefault();
         setLocale();
         loadConfig();
diff --git a/src/main/java/com/topjohnwu/magisk/SplashActivity.java b/src/main/java/com/topjohnwu/magisk/SplashActivity.java
index 43e54b61e..d11e43343 100644
--- a/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+++ b/src/main/java/com/topjohnwu/magisk/SplashActivity.java
@@ -11,6 +11,7 @@ import com.topjohnwu.magisk.asyncs.LoadModules;
 import com.topjohnwu.magisk.asyncs.ParallelTask;
 import com.topjohnwu.magisk.asyncs.UpdateRepos;
 import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
 import com.topjohnwu.magisk.receivers.ShortcutReceiver;
 import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Utils;
@@ -24,6 +25,7 @@ public class SplashActivity extends Activity {
 
         MagiskManager mm = getMagiskManager();
 
+        mm.repoDB = new RepoDatabaseHelper(this);
         mm.loadMagiskInfo();
         mm.getDefaultInstallFlags();
         Utils.loadPrefs();
diff --git a/src/main/java/com/topjohnwu/magisk/container/Repo.java b/src/main/java/com/topjohnwu/magisk/container/Repo.java
index fbd16d5c4..734c4235e 100644
--- a/src/main/java/com/topjohnwu/magisk/container/Repo.java
+++ b/src/main/java/com/topjohnwu/magisk/container/Repo.java
@@ -42,7 +42,7 @@ public class Repo extends BaseModule {
         if (getVersionCode() < 0) {
             throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
         }
-        if (getMinMagiskVersion() < Const.MIN_MODULE_VER) {
+        if (getMinMagiskVersion() < Const.MIN_MODULE_VER()) {
             throw new IllegalRepoException("Repo [" + repoName + "] is outdated");
         }
     }
diff --git a/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java b/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
index 2e2819b94..71795706c 100644
--- a/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
+++ b/src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
@@ -26,9 +26,9 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
         mm = Utils.getMagiskManager(context);
         mDb = getWritableDatabase();
 
-        // Clear bad repos
+        // Remove outdated repos
         mDb.delete(TABLE_NAME, "minMagisk<?",
-                new String[] { String.valueOf(Const.MIN_MODULE_VER) });
+                new String[] { String.valueOf(Const.MIN_MODULE_VER()) });
     }
 
     @Override
diff --git a/src/main/java/com/topjohnwu/magisk/utils/Const.java b/src/main/java/com/topjohnwu/magisk/utils/Const.java
index ddf0e64d6..2a53fcf8c 100644
--- a/src/main/java/com/topjohnwu/magisk/utils/Const.java
+++ b/src/main/java/com/topjohnwu/magisk/utils/Const.java
@@ -36,7 +36,10 @@ public class Const {
     // Versions
     public static final int UPDATE_SERVICE_VER = 1;
     public static final int SNET_VER = 7;
-    public static final int MIN_MODULE_VER = 1400;
+
+    public static int MIN_MODULE_VER() {
+        return MagiskManager.get().magiskVersionCode >= 1630 ? 1500 : 1400;
+    }
 
     public synchronized static SuFile MAGISK_PATH() {
         SuFile file;