diff --git a/res/layout/activity_updates.xml b/res/layout/activity_updates.xml
index 52e6aa7fe302ac0133d72bb34739c38c95d69dca..1db6fcfb21f47287a20b7e10abb7ac2a154ae2cb 100644
--- a/res/layout/activity_updates.xml
+++ b/res/layout/activity_updates.xml
@@ -132,6 +132,7 @@
             android:paddingStart="16dp"
             android:textSize="16sp"
             android:background="@color/toolbar_collapsed"
+            android:visibility="gone"
             android:text="@string/e_available_updates"
             android:textColor="?android:textColorPrimary" />
         
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index 75074bdaf481711bd3d620c016bdabde82189ab5..835eba98241036cc9edc5464dc03da5694a55a5d 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -111,6 +111,10 @@ public class UpdatesActivity extends UpdatesListActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_updates);
 
+        if (UpdaterService.isDeviceRebooted()) {
+            Utils.removeInstalledUpdate(this);
+        }
+
         UiModeManager uiModeManager = getSystemService(UiModeManager.class);
         mIsTV = uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
 
@@ -299,9 +303,11 @@ public class UpdatesActivity extends UpdatesListActivity {
         if (sortedUpdates.isEmpty()) {
             findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
             findViewById(R.id.content).setVisibility(View.GONE);
+            findViewById(R.id.available_update_header).setVisibility(View.GONE);
         } else {
             findViewById(R.id.no_new_updates_view).setVisibility(View.GONE);
             findViewById(R.id.content).setVisibility(View.VISIBLE);
+            findViewById(R.id.available_update_header).setVisibility(View.VISIBLE);
             sortedUpdates.sort((u1, u2) -> Long.compare(u2.getTimestamp(), u1.getTimestamp()));
             for (UpdateInfo update : sortedUpdates) {
                 updateIds.add(update.getDownloadId());
@@ -458,6 +464,7 @@ public class UpdatesActivity extends UpdatesListActivity {
             }
         } else {
             findViewById(R.id.content).setVisibility(View.GONE);
+            findViewById(R.id.available_update_header).setVisibility(View.GONE);
             findViewById(R.id.no_new_updates_view).setVisibility(View.GONE);
             findViewById(R.id.refresh_progress).setVisibility(View.VISIBLE);
         }
@@ -473,6 +480,7 @@ public class UpdatesActivity extends UpdatesListActivity {
             findViewById(R.id.refresh_progress).setVisibility(View.GONE);
             if (mAdapter.getItemCount() > 0) {
                 findViewById(R.id.content).setVisibility(View.VISIBLE);
+                findViewById(R.id.available_update_header).setVisibility(View.VISIBLE);
             } else {
                 findViewById(R.id.no_new_updates_view).setVisibility(View.VISIBLE);
             }
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index d713153c3f53293eb329adeb00d937b758505545..3deaecf7706bbcedbac74f935a1e0cf696ad8418 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -97,6 +97,8 @@ public class UpdaterService extends Service {
     private static ConnectivityManager.NetworkCallback mConnectionStateMonitor;
     private static ConnectivityManager mConnectivityManager;
 
+    private static boolean mDeviceRebooted = true;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -263,6 +265,10 @@ public class UpdaterService extends Service {
         return mUpdaterController;
     }
 
+    public static boolean isDeviceRebooted() {
+        return mDeviceRebooted;
+    }
+
     private void tryStopSelf() {
         if (isNetworkCallBackActive || areNotificationsActive()) return;
         if (!mHasClients && !mUpdaterController.hasActiveDownloads() &&
@@ -282,6 +288,8 @@ public class UpdaterService extends Service {
     private void handleUpdateStatusChange(UpdateInfo update) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = pref.edit();
+        mNotificationBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
+        mDeviceRebooted = false;
         switch (update.getStatus()) {
             case DELETED: {
                 notifySystemUpdaterService(STATUS_WAITING_DOWNLOAD, update);
@@ -489,6 +497,7 @@ public class UpdaterService extends Service {
                 mNotificationBuilder.setTicker(text);
                 mNotificationBuilder.setOngoing(true);
                 mNotificationBuilder.setAutoCancel(false);
+                mNotificationBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
                 mNotificationManager.notify(NOTIFICATION_ID, mNotificationBuilder.build());
 
                 boolean deleteUpdate = pref.getBoolean(Constants.PREF_AUTO_DELETE_UPDATES, true);
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 880327816772a54ad4c253d91acb20f3066d2d02..0ff5e42efea3d008c4787c9a3f8679003169727f 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -494,9 +494,11 @@ public class Utils {
     public static void removeInstalledUpdate(Context context) {
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
         String downloadId = pref.getString(Constants.PREF_NEEDS_DELETE_ID, null);
-        UpdaterController controller = UpdaterController.getInstance(context);
-        if (controller != null && downloadId != null) {
-            controller.deleteUpdate(downloadId);
+        if (downloadId != null) {
+            UpdaterController controller = UpdaterController.getInstance(context);
+            if (controller != null) {
+                controller.deleteUpdate(downloadId);
+            }
             pref.edit().remove(Constants.PREF_NEEDS_DELETE_ID).apply();
         }
     }