diff --git a/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt
index 47012d586..6c0e93772 100644
--- a/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/caldav/LocalListSettingsActivity.kt
@@ -29,6 +29,7 @@ class LocalListSettingsActivity : BaseCaldavCalendarSettingsActivity() {
         account: CaldavAccount, calendar: CaldavCalendar, name: String, color: Int) =
             updateCalendar()
 
+    // TODO: prevent deleting the last list
     override suspend fun deleteCalendar(caldavAccount: CaldavAccount, caldavCalendar: CaldavCalendar) =
             onDeleted(true)
 }
diff --git a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
index f86996191..74c9e6e70 100644
--- a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
+++ b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
@@ -11,6 +11,7 @@ import org.tasks.data.dao.TagDataDao
 import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_ONLY
 import org.tasks.data.entity.CaldavTask
 import org.tasks.data.entity.Task
+import org.tasks.data.getLocalList
 import org.tasks.filters.CaldavFilter
 import org.tasks.filters.CustomFilter
 import org.tasks.filters.Filter
@@ -90,7 +91,12 @@ class DefaultFilterProvider @Inject constructor(
                     ?.let { caldavDao.getAccountByUuid(it) }
                     ?.let { account -> CaldavFilter(calendar = list, account = account) }
             }
-            ?: throw IllegalStateException()
+            ?: caldavDao.getLocalList().let { list ->
+                CaldavFilter(
+                    calendar = list,
+                    account = caldavDao.getAccountByUuid(list.account!!)!!
+                )
+            }
         defaultList = filter
         return filter
     }