diff --git a/CHANGELOG.md b/CHANGELOG.md
index 204704be4..f691a7d1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+-   Worked around a dependency bug that would crash the Autofill service when triggered on an OTP field
+
 ## [1.10.2] - 2020-07-30
 
 ### Fixed
diff --git a/dependencies.gradle b/dependencies.gradle
index d05e0e6da..301b4ea9b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -17,8 +17,9 @@ ext.deps = [
 
     kotlin: [
         coroutines: [
-            android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7',
-            core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7',
+            // #989: Keep these at 1.3.6 as long as we are not using Kotlin 1.4 to prevent crashes.
+            android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6',
+            core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6',
         ],
         stdlib8: 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72'
     ],