diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d81765b1a..1a790e87e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -172,6 +172,8 @@ android {
                     nativeSymbolUploadEnabled = true
                     unstrippedNativeLibsDir = path
                 }
+            } else {
+                resValue("string", "com.crashlytics.android.build_id", "none")
             }
             buildConfigField("Boolean", "CRASHLYTICS_ENABLED", crashlyticsAvailable.toString())
         }
@@ -199,6 +201,8 @@ android {
                     nativeSymbolUploadEnabled = true
                     unstrippedNativeLibsDir = path
                 }
+            } else {
+                resValue("string", "com.crashlytics.android.build_id", "none")
             }
             buildConfigField("Boolean", "CRASHLYTICS_ENABLED", crashlyticsAvailable.toString())
         }
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 819964db3..66cb17ae9 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -564,7 +564,7 @@ class CoreContext
     private var logcatEnabled: Boolean = corePreferences.printLogsInLogcat
 
     private var crashlyticsEnabled: Boolean = corePreferences.sendLogsToCrashlytics
-    private var crashlyticsAvailable = true
+    private var crashlyticsAvailable = BuildConfig.CRASHLYTICS_ENABLED
 
     private val loggingServiceListener = object : LoggingServiceListenerStub() {
         @WorkerThread
@@ -583,7 +583,7 @@ class CoreContext
                     else -> android.util.Log.d(domain, message)
                 }
             }
-            if (crashlyticsEnabled) {
+            if (crashlyticsAvailable && crashlyticsEnabled) {
                 FirebaseCrashlytics.getInstance().log("[$domain] [${level.name}] $message")
             }
         }