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 b3a382943..4d6f1bf7b 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -363,9 +363,10 @@ public class InstallManagerService extends Service {
      */
     private static Apk removeFromActive(String urlString) {
         Apk apk = ACTIVE_APKS.remove(urlString);
-        if (apk != null) {
-            ACTIVE_APPS.remove(apk.packageName);
+        if (apk == null) {
+            return new Apk();
         }
+        ACTIVE_APPS.remove(apk.packageName);
         return apk;
     }