diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b6839ca..dc817ee01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Change Log
 ---
+### 6.6.5 (2019-05-21)
+
+* Handle [breaking change](https://issuetracker.google.com/issues/133254108) in Google Tasks API
+
 ### 6.6.3 (2019-05-08)
 
 * Fix backup import crash
diff --git a/app/build.gradle b/app/build.gradle
index 0cc62af39..249feb0ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 579
-        versionName "6.6.3"
+        versionCode 581
+        versionName "6.6.4"
         targetSdkVersion 28
         minSdkVersion 16
         multiDexEnabled true
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
index ccb652d2f..89eb9dda8 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -199,7 +199,7 @@ public class GoogleTaskSynchronizer {
         gtaskLists.addAll(items);
       }
       nextPageToken = remoteLists.getNextPageToken();
-    } while (nextPageToken != null);
+    } while (!Strings.isNullOrEmpty(nextPageToken));
     gtasksListService.updateLists(account, gtaskLists);
     Filter defaultRemoteList = defaultFilterProvider.getDefaultRemoteList();
     if (defaultRemoteList instanceof GtasksFilter) {
@@ -372,7 +372,7 @@ public class GoogleTaskSynchronizer {
         tasks.addAll(items);
       }
       nextPageToken = taskList.getNextPageToken();
-    } while (nextPageToken != null);
+    } while (!Strings.isNullOrEmpty(nextPageToken));
 
     Collections.sort(tasks, PARENTS_FIRST);