diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12a0cb13a..c55a456d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 Change Log
 ---
 =======
-### 9.7.1 (2020-06-18)
+### 9.7.1 (2020-06-19)
 
 * Fix crash on backup import
+* Fix CalDAV/EteSync subtask move bug
 
 ### 9.7 (2020-06-12)
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6e1d6d6a9..83a72aa1c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 90701
+        versionCode = 90702
         versionName = "9.7.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
index b2f59f4aa..79e9b6adc 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.kt
@@ -84,10 +84,12 @@ abstract class TaskDao(private val database: Database) {
             + "ORDER BY CASE WHEN gt_parent = 0 THEN 0 ELSE 1 END, gt_order ASC")
     abstract fun getGoogleTasksToPush(account: String): List<Task>
 
-    @Query("SELECT tasks.* FROM tasks "
-            + "LEFT JOIN caldav_tasks ON tasks._id = caldav_tasks.cd_task "
-            + "WHERE caldav_tasks.cd_calendar = :calendar "
-            + "AND tasks.modified > caldav_tasks.cd_last_sync")
+    @Query("""
+        SELECT tasks.*
+        FROM tasks
+                 INNER JOIN caldav_tasks ON tasks._id = caldav_tasks.cd_task
+        WHERE caldav_tasks.cd_calendar = :calendar
+          AND (tasks.modified > caldav_tasks.cd_last_sync OR caldav_tasks.cd_last_sync = 0)""")
     abstract fun getCaldavTasksToPush(calendar: String): List<Task>
 
     @Query("SELECT * FROM TASKS "
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
index 429359881..8333a1d77 100644
--- a/app/src/main/res/values/changelog.xml
+++ b/app/src/main/res/values/changelog.xml
@@ -4,6 +4,7 @@
         <item>Added \'☰ > Manage lists\'\n\t- Drag and drop to rearrange the drawer\n\t- Tap to edit or delete a list</item>
         <item>Display 2 additional snooze options - @rangzen</item>
         <item>Fix crash on backup import</item>
+        <item>Fix CalDAV/EteSync subtask move bug</item>
         <item>Update translations</item>
     </string-array>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/90701.txt b/fastlane/metadata/android/en-US/changelogs/90701.txt
deleted file mode 100644
index 6b69ec907..000000000
--- a/fastlane/metadata/android/en-US/changelogs/90701.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix crash on backup import
diff --git a/fastlane/metadata/android/en-US/changelogs/90702.txt b/fastlane/metadata/android/en-US/changelogs/90702.txt
new file mode 100644
index 000000000..13115e11e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/90702.txt
@@ -0,0 +1,2 @@
+* Fix crash on backup import
+* Fix CalDAV/EteSync subtask move bug