diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
index 3ba0e8510..c7ebc23da 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
@@ -427,6 +427,7 @@ public final class AppUpdateStatusManager {
                 entry.errorText = errorText;
                 entry.intent = null;
                 notifyChange(entry, true);
+                removeApk(url);
             }
         }
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
index 12140cf9e..baf0ad2e3 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -176,7 +176,6 @@ public class InstallManagerService extends Service {
                 DownloaderService.cancel(this, apk.getPatchObbUrl());
                 DownloaderService.cancel(this, apk.getMainObbUrl());
             }
-            appUpdateStatusManager.removeApk(urlString);
             return START_NOT_STICKY;
         } else if (ACTION_INSTALL.equals(action)) {
             if (!isPendingInstall(urlString)) {