diff --git a/app/src/main/java/org/mozilla/focus/telemetry/CrashReporterWrapper.kt b/app/src/main/java/org/mozilla/focus/telemetry/CrashReporterWrapper.kt
index dc0961b832d..c0e7adb4c6a 100644
--- a/app/src/main/java/org/mozilla/focus/telemetry/CrashReporterWrapper.kt
+++ b/app/src/main/java/org/mozilla/focus/telemetry/CrashReporterWrapper.kt
@@ -36,7 +36,8 @@ object CrashReporterWrapper {
         // The BuildConfig value is populated from a file at compile time.
         // If the file did not exist, the value will be null.
         val supportedBuild = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-        if (!supportedBuild || BuildConfig.SENTRY_TOKEN.isEmpty()) return
+        val hasSentryToken = BuildConfig.SENTRY_TOKEN != null
+        if (!hasSentryToken || !supportedBuild || BuildConfig.SENTRY_TOKEN.isEmpty()) return
 
         val sentryDsn = BuildConfig.SENTRY_TOKEN