diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1cf9959be..06acae5ac 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,7 +25,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 594
+        versionCode = 595
         versionName = "6.8.0"
         targetSdkVersion(Versions.compileSdk)
         minSdkVersion(Versions.minSdk)
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index 14f40e7ba..d9ddf8f33 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -49,7 +49,9 @@ public class GtasksFilterExposer {
       if (!filters.containsKey(filter.googleTaskAccount)) {
         filters.put(filter.googleTaskAccount, new ArrayList<>());
       }
-      filters.get(filter.googleTaskAccount).add(filter.toGtasksFilter());
+      if (filter.googleTaskList != null) {
+        filters.get(filter.googleTaskAccount).add(filter.toGtasksFilter());
+      }
     }
     return filters;
   }
diff --git a/app/src/main/java/org/tasks/caldav/CaldavFilterExposer.java b/app/src/main/java/org/tasks/caldav/CaldavFilterExposer.java
index 10cceb94e..9d2da7bca 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavFilterExposer.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavFilterExposer.java
@@ -33,7 +33,9 @@ public class CaldavFilterExposer {
       if (!filters.containsKey(filter.caldavAccount)) {
         filters.put(filter.caldavAccount, new ArrayList<>());
       }
-      filters.get(filter.caldavAccount).add(filter.toCaldavFilter());
+      if (filter.caldavCalendar != null) {
+        filters.get(filter.caldavAccount).add(filter.toCaldavFilter());
+      }
     }
     return filters;
   }