diff --git a/gradle.properties b/gradle.properties
index 675163e5528cd6ff4026a347b009e4caffe22978..e379606f15744fb75fa05489f44601ed949877e4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8=false
 android.databinding.incremental=true
 kapt.incremental.apt=true
 kapt.use.worker.api=true
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index e91f98cd942c040e0c012949350e946823546d25..02d743e80998194309c71f2ae41ffaad82a5a491 100644
--- a/vlc-android/build.gradle
+++ b/vlc-android/build.gradle
@@ -64,7 +64,6 @@ android {
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         vectorDrawables.useSupportLibrary = true
-        multiDexEnabled true
 
         tasks.whenTaskAdded { task ->
             if (task.name.startsWith('merge')) {
@@ -127,6 +126,7 @@ android {
         debug {
             applicationIdSuffix ".debug"
             jniDebuggable true
+            multiDexEnabled true
         }
         dev {
             initWith debug