diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
index 2a4f6b2f7..92ad8d14c 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
@@ -713,7 +713,6 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
     public void installCancel() {
         if (isAppDownloading()) {
             InstallManagerService.cancel(this, currentStatus.getUniqueKey());
-            adapter.clearProgress();
         }
     }
 
diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
index 7b291609f..b9ae3c7fe 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
@@ -379,7 +379,6 @@ public final class AppUpdateStatusManager {
             AppUpdateStatus entry = appMapping.get(key);
             if (entry != null) {
                 Utils.debugLog(LOGTAG, "Remove APK " + entry.apk.apkName);
-                appMapping.remove(entry.apk.getUrl());
                 notifyRemove(entry);
             }
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
index 8ac4633ac..ca63ec17c 100644
--- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
+++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
@@ -246,7 +246,9 @@ public class DownloaderService extends Service {
     private void sendBroadcast(Uri uri, String action, File file, String errorMessage, long repoId,
                                String originalUrlString) {
         Intent intent = new Intent(action);
-        intent.setData(Uri.parse(originalUrlString));
+        if (originalUrlString != null) {
+            intent.setData(Uri.parse(originalUrlString));
+        }
         if (file != null) {
             intent.putExtra(Downloader.EXTRA_DOWNLOAD_PATH, file.getAbsolutePath());
         }