diff --git a/src/org/lineageos/updater/UpdaterReceiver.java b/src/org/lineageos/updater/UpdaterReceiver.java
index f295f05c065b1c71d3983f09deae7eda8299919c..f412f4e3295b2f24f19fd428c51b470d24d30cc2 100644
--- a/src/org/lineageos/updater/UpdaterReceiver.java
+++ b/src/org/lineageos/updater/UpdaterReceiver.java
@@ -28,6 +28,7 @@ import android.os.SystemProperties;
 import androidx.core.app.NotificationCompat;
 import androidx.preference.PreferenceManager;
 
+import org.lineageos.updater.controller.UpdaterController;
 import org.lineageos.updater.misc.BuildInfoUtils;
 import org.lineageos.updater.misc.Constants;
 import org.lineageos.updater.misc.StringGenerator;
@@ -86,12 +87,18 @@ public class UpdaterReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
         if (ACTION_INSTALL_REBOOT.equals(intent.getAction())) {
+            String downloadId = pref.getString(Constants.PREF_NEEDS_DELETE_ID, null);
+            UpdaterController controller = UpdaterController.getInstance(context);
+            if (controller != null && downloadId != null) {
+                controller.deleteUpdate(downloadId);
+            }
             PowerManager pm = context.getSystemService(PowerManager.class);
             pm.reboot(null);
         } else if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-            SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
             pref.edit().remove(Constants.PREF_NEEDS_REBOOT_ID).apply();
+            pref.edit().remove(Constants.PREF_NEEDS_DELETE_ID).apply();
 
             if (shouldShowUpdateFailedNotification(context)) {
                 pref.edit().putBoolean(Constants.PREF_INSTALL_NOTIFIED, true).apply();
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index d2ac3fdd02e41888722b11eb5f1d1a83d24b8e35..d713153c3f53293eb329adeb00d937b758505545 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -55,6 +55,7 @@ import org.lineageos.updater.model.UpdateStatus;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.NumberFormat;
+import java.util.Arrays;
 
 public class UpdaterService extends Service {
 
@@ -263,27 +264,19 @@ public class UpdaterService extends Service {
     }
 
     private void tryStopSelf() {
+        if (isNetworkCallBackActive || areNotificationsActive()) return;
         if (!mHasClients && !mUpdaterController.hasActiveDownloads() &&
-                !mUpdaterController.isInstallingUpdate() && !isNetworkCallBackActive()
-                && !areNotificationsActive()) {
+                !mUpdaterController.isInstallingUpdate()) {
             Log.d(TAG, "Service no longer needed, stopping");
             stopSelf();
         }
     }
 
     private boolean areNotificationsActive() {
-        NotificationManager notificationManager =
-                (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-        StatusBarNotification[] notifications = notificationManager.getActiveNotifications();
-        if (notifications != null && notifications.length > 0) {
-            for (StatusBarNotification notification : notifications) {
-                if (notification.getId() == NOTIFICATION_ID &&
-                        notification.getPackageName().equals(getPackageName())) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        StatusBarNotification[] notifications = mNotificationManager.getActiveNotifications();
+        return notifications != null && Arrays.stream(notifications)
+                .anyMatch(notification -> notification.getId() == NOTIFICATION_ID ||
+                        notification.getPackageName().equals(getPackageName()));
     }
 
     private void handleUpdateStatusChange(UpdateInfo update) {
@@ -494,13 +487,14 @@ public class UpdaterService extends Service {
                         getString(R.string.reboot),
                         getRebootPendingIntent());
                 mNotificationBuilder.setTicker(text);
-                mNotificationBuilder.setOngoing(false);
-                mNotificationBuilder.setAutoCancel(true);
+                mNotificationBuilder.setOngoing(true);
+                mNotificationBuilder.setAutoCancel(false);
                 mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
 
                 boolean deleteUpdate = pref.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true);
                 if (deleteUpdate) {
-                    mUpdaterController.deleteUpdate(update.getDownloadId());
+                    pref.edit().putString(Constants.PREF_NEEDS_DELETE_ID,
+                            update.getDownloadId()).apply();
                 }
 
                 tryStopSelf();
diff --git a/src/org/lineageos/updater/misc/Constants.java b/src/org/lineageos/updater/misc/Constants.java
index efe48c1539a25d3ea0c9e179c718bf9d10965a61..4cc912ba8e294745b1521fba255648915858983a 100644
--- a/src/org/lineageos/updater/misc/Constants.java
+++ b/src/org/lineageos/updater/misc/Constants.java
@@ -38,6 +38,7 @@ public final class Constants {
     public static final String PREF_AB_PERF_MODE = "ab_perf_mode";
     public static final String PREF_MOBILE_DATA_WARNING = "pref_mobile_data_warning";
     public static final String PREF_NEEDS_REBOOT_ID = "needs_reboot_id";
+    public static final String PREF_NEEDS_DELETE_ID = "needs_delete_id";
 
     public static final String UNCRYPT_FILE_EXT = ".uncrypt";