diff --git a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
index b9c607add..e4ebe6322 100644
--- a/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java
@@ -128,7 +128,11 @@ public class TaskFormActivity extends AppCompatActivity implements AdapterView.O
     }
 
     private void createCheckListRecyclerView() {
-        checklistAdapter = new CheckListAdapter(task.getChecklist());
+        List<ChecklistItem> checklistItems = new ArrayList<>();
+        if (task.getChecklist() != null) {
+            checklistItems = task.getChecklist();
+        }
+        checklistAdapter = new CheckListAdapter(checklistItems);
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.checklist_recycler_view);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);