diff --git a/build.gradle b/build.gradle
index 348da66e1..63d256682 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,6 @@ android {
         versionName "4.9.8"
         minSdkVersion 15
         targetSdkVersion 25
-        multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         jackOptions {
             enabled true
@@ -52,6 +51,9 @@ android {
     }
 
     buildTypes {
+        debug {
+            multiDexEnabled true
+        }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
@@ -115,9 +117,10 @@ dependencies {
     debugCompile "com.facebook.stetho:stetho:${STETHO_VERSION}"
     debugCompile "com.facebook.stetho:stetho-timber:${STETHO_VERSION}@aar"
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
+    //noinspection GradleCompatible
+    debugCompile 'com.android.support:multidex:1.0.1'
 
     compile 'com.github.rey5137:material:1.2.4'
-    compile 'com.android.support:multidex:1.0.1'
     compile 'com.nononsenseapps:filepicker:4.0.0'
     compile "com.android.support:design:${SUPPORT_VERSION}"
     compile "com.android.support:support-annotations:${SUPPORT_VERSION}"
diff --git a/src/debug/java/org/tasks/BaseApplication.java b/src/debug/java/org/tasks/BaseApplication.java
new file mode 100644
index 000000000..8037c11f0
--- /dev/null
+++ b/src/debug/java/org/tasks/BaseApplication.java
@@ -0,0 +1,6 @@
+package org.tasks;
+
+import android.support.multidex.MultiDexApplication;
+
+public class BaseApplication extends MultiDexApplication {
+}
diff --git a/src/main/java/org/tasks/injection/InjectingApplication.java b/src/main/java/org/tasks/injection/InjectingApplication.java
index 3f819b316..f2af6fb9c 100644
--- a/src/main/java/org/tasks/injection/InjectingApplication.java
+++ b/src/main/java/org/tasks/injection/InjectingApplication.java
@@ -1,11 +1,11 @@
 package org.tasks.injection;
 
 import android.content.Context;
-import android.support.multidex.MultiDexApplication;
 
+import org.tasks.BaseApplication;
 import org.tasks.locale.Locale;
 
-public abstract class InjectingApplication extends MultiDexApplication {
+public abstract class InjectingApplication extends BaseApplication {
 
     private ApplicationComponent applicationComponent;
 
diff --git a/src/release/java/org/tasks/BaseApplication.java b/src/release/java/org/tasks/BaseApplication.java
new file mode 100644
index 000000000..8436e8941
--- /dev/null
+++ b/src/release/java/org/tasks/BaseApplication.java
@@ -0,0 +1,6 @@
+package org.tasks;
+
+import android.app.Application;
+
+public class BaseApplication extends Application {
+}