diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
index 1addf82258..f17265db91 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
@@ -80,6 +80,8 @@ public final class MainActivity extends AppCompatActivity implements MainView
   {
     super.onResume();
 
+    boolean cacheAlreadyLoading = GameFileCacheService.isLoading();
+
     if (DirectoryInitialization.shouldStart(this))
     {
       DirectoryInitialization.start(this);
@@ -93,14 +95,12 @@ public final class MainActivity extends AppCompatActivity implements MainView
     // such as system language, cover downloading...
     forEachPlatformGamesView(PlatformGamesView::refetchMetadata);
 
-    if (sShouldRescanLibrary)
+    if (sShouldRescanLibrary && !cacheAlreadyLoading)
     {
       GameFileCacheService.startRescan(this);
     }
-    else
-    {
-      sShouldRescanLibrary = true;
-    }
+
+    sShouldRescanLibrary = true;
   }
 
   @Override
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
index d34c3d8518..a568f47156 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -68,6 +68,8 @@ public final class TvMainActivity extends FragmentActivity implements MainView
   {
     super.onResume();
 
+    boolean cacheAlreadyLoading = GameFileCacheService.isLoading();
+
     if (DirectoryInitialization.shouldStart(this))
     {
       DirectoryInitialization.start(this);
@@ -80,14 +82,12 @@ public final class TvMainActivity extends FragmentActivity implements MainView
     // such as system language, cover downloading...
     refetchMetadata();
 
-    if (sShouldRescanLibrary)
+    if (sShouldRescanLibrary && !cacheAlreadyLoading)
     {
       GameFileCacheService.startRescan(this);
     }
-    else
-    {
-      sShouldRescanLibrary = true;
-    }
+
+    sShouldRescanLibrary = true;
   }
 
   @Override