diff --git a/system/src/Grav/Common/Upgrade/SafeUpgradeService.php b/system/src/Grav/Common/Upgrade/SafeUpgradeService.php
index a0670750b..b8cab0a8a 100644
--- a/system/src/Grav/Common/Upgrade/SafeUpgradeService.php
+++ b/system/src/Grav/Common/Upgrade/SafeUpgradeService.php
@@ -418,15 +418,9 @@ class SafeUpgradeService
      */
     public function clearRecoveryFlag(): void
     {
-        $paths = [
-            $this->rootPath . '/user/data/recovery.flag',
-            $this->rootPath . '/user/data/recovery.window',
-        ];
-
-        foreach ($paths as $path) {
-            if (is_file($path)) {
-                @unlink($path);
-            }
+        $flag = $this->rootPath . '/user/data/recovery.flag';
+        if (is_file($flag)) {
+            @unlink($flag);
         }
     }
 
diff --git a/system/src/Grav/Console/Gpm/UpdateCommand.php b/system/src/Grav/Console/Gpm/UpdateCommand.php
index b4d8df7b7..897026f67 100644
--- a/system/src/Grav/Console/Gpm/UpdateCommand.php
+++ b/system/src/Grav/Console/Gpm/UpdateCommand.php
@@ -235,8 +235,6 @@ class UpdateCommand extends GpmCommand
             return 1;
         }
 
-        $recovery->closeUpgradeWindow();
-
         return 0;
     }
 
diff --git a/tests/unit/Grav/Common/Upgrade/SafeUpgradeServiceTest.php b/tests/unit/Grav/Common/Upgrade/SafeUpgradeServiceTest.php
index c3f0082bc..2569683df 100644
--- a/tests/unit/Grav/Common/Upgrade/SafeUpgradeServiceTest.php
+++ b/tests/unit/Grav/Common/Upgrade/SafeUpgradeServiceTest.php
@@ -199,7 +199,7 @@ PHP;
         $service->clearRecoveryFlag();
 
         self::assertFileDoesNotExist($flag);
-        self::assertFileDoesNotExist($window);
+        self::assertFileExists($window);
     }
 
     /**