diff --git a/app/build.gradle b/app/build.gradle
index dbee2cd49..c21105618 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,15 +68,17 @@ android {
             outputFileName = "linphone-android-${variant.buildType.name}-${project.version}.apk"
         }
 
-        // https://developer.android.com/studio/releases/gradle-plugin#3-6-0-behavior for extractNativeLibs
+        // See https://developer.android.com/studio/releases/gradle-plugin#3-6-0-behavior for why extractNativeLibs is set to true in debug flavor
         if (variant.buildType.name == "release") {
             variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address",
                                                             linphone_file_provider: getPackageName() + ".fileprovider",
-                                                            appLabel: "@string/app_name"]
+                                                            appLabel: "@string/app_name",
+                                                            extractNativeLibs: "false"]
         } else {
             variant.getMergedFlavor().manifestPlaceholders = [linphone_address_mime_type: "vnd.android.cursor.item/vnd." + getPackageName() + ".provider.sip_address",
                                                             linphone_file_provider: getPackageName() + ".debug.fileprovider",
-                                                            appLabel: "@string/app_name_debug"]
+                                                            appLabel: "@string/app_name_debug",
+                                                            extractNativeLibs: "true"]
         }
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3cc12c3aa..d9d6b5bb2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="${appLabel}"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:extractNativeLibs="${extractNativeLibs}"
         android:theme="@style/AppTheme">
 
         <activity