diff --git a/app/build.gradle b/app/build.gradle
index bc473a19b..b4378c22d 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 580
+        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 52d677024..3944fe345 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -346,7 +346,7 @@ public class GoogleTaskSynchronizer {
           tasks.addAll(items);
         }
         nextPageToken = taskList.getNextPageToken();
-      } while (nextPageToken != null);
+      } while (!Strings.isNullOrEmpty(nextPageToken));
 
       for (com.google.api.services.tasks.model.Task gtask : tasks) {
         String remoteId = gtask.getId();