diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index ef657bbe9..8244f4820 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -212,9 +212,13 @@ android {
         }
 
         debug {
-            minifyEnabled true
-            proguardFiles = buildTypes.release.proguardFiles
-            testProguardFiles 'proguard-rules-test.pro'
+            // ProGuard disabled for debug builds, instead multidex is enabled!
+            // faster consecutive build times for developing, https://github.com/open-keychain/open-keychain/pull/2247
+            minifyEnabled false
+            //proguardFiles = buildTypes.release.proguardFiles
+            //testProguardFiles 'proguard-rules-test.pro'
+            
+            multiDexEnabled true
 
             applicationIdSuffix ".debug"