diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp
index aa9c67fbc..26121405d 100644
--- a/es-app/src/guis/GuiThemeDownloader.cpp
+++ b/es-app/src/guis/GuiThemeDownloader.cpp
@@ -263,6 +263,12 @@ bool GuiThemeDownloader::fetchRepository(const std::string& repositoryName,
             }
         }
 
+        if (allowReset && checkLocalChanges(repository)) {
+            LOG(LogInfo) << "Repository \"" << repositoryName
+                         << "\" contains local changes, performing hard reset";
+            resetRepository(repository);
+        }
+
         if (mergeAnalysis & GIT_MERGE_ANALYSIS_UP_TO_DATE) {
             LOG(LogInfo) << "Repository \"" << repositoryName << "\" already up to date";
             if (repositoryName != "themes-list")
@@ -275,12 +281,6 @@ bool GuiThemeDownloader::fetchRepository(const std::string& repositoryName,
             return false;
         }
 
-        if (allowReset && checkLocalChanges(repository)) {
-            LOG(LogInfo) << "Repository \"" << repositoryName
-                         << "\" contains local changes, performing hard reset";
-            resetRepository(repository);
-        }
-
         LOG(LogInfo) << "Performing Git fast-forward of repository \"" << repositoryName << "\"";
 
         git_reference* oldTargetRef {nullptr};