diff --git a/app/build.gradle b/app/build.gradle
index 030dcfa4a..4c4c52a1b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        multiDexEnabled true
+        multiDexEnabled false
         vectorDrawables.useSupportLibrary true
         // Version code schema:
         // "1.2.3-SNAPSHOT" -> 1020300
@@ -63,6 +63,14 @@ android {
         debug {
             applicationIdSuffix ".debug"
             resValue "string", "provider_authority", "de.danoeh.antennapod.debug.provider"
+
+            // debug build has method count over 64k single-dex threshold. 
+            // For building debug build to use on Android < 21 (pre-Android 5) devices, 
+            // you need to manually change class
+            // de.danoeh.antennapod.PodcastApp to extend MultiDexApplication . 
+            // See Issue #2813
+            multiDexEnabled true
+            
             dexcount {
                 if (project.hasProperty("enableDexcountInDebug")) {
                     runOnEachPackage enableDexcountInDebug.toBoolean()