diff --git a/gradle.properties b/gradle.properties
index 897747e526..4fbfee8b08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
-org.gradle.jvmargs=-Xmx12g -Xms256m -XX:MaxMetaspaceSize=1g
+# R8 thread count set to 1 to avoid non-determinstic behavior
+org.gradle.jvmargs=-Xmx12g -Xms256m -XX:MaxMetaspaceSize=1g -Dcom.android.tools.r8.threadCount=1
 android.useAndroidX=true
 android.experimental.androidTest.numManagedDeviceShards=1
 org.gradle.configuration-cache=true