diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 957952a7..37b0f94f 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -204,7 +204,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
 
     @Override
     public void onBindViewHolder(final ViewHolder viewHolder, int i) {
-        if (mUpdaterController == null) {
+        if (mDownloadIds == null) {
             viewHolder.mAction.setEnabled(false);
             return;
         }
@@ -260,10 +260,16 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
     }
 
     public void notifyItemChanged(String downloadId) {
+        if (mDownloadIds == null) {
+            return;
+        }
         notifyItemChanged(mDownloadIds.indexOf(downloadId));
     }
 
     public void removeItem(String downloadId) {
+        if (mDownloadIds == null) {
+            return;
+        }
         int position = mDownloadIds.indexOf(downloadId);
         mDownloadIds.remove(downloadId);
         notifyItemRemoved(position);