diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
index 5eed564c97..2aa36c5413 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt
@@ -18,10 +18,14 @@ class AmplitudeAnalyticsHandler(
     }
 
     class Builder : AnalyticsHandlerBuilder {
-        override fun build(data: AnalyticsHandlerBuilder.Data): AnalyticsHandler? = when {
-            !data.isDebug -> AmplitudeClient(data.application, data.config.amplitudeApiKey)
-            data.isDebug && data.logConfig.amplitude -> AmplitudeLogClient(data.jsonConverter)
-            else -> null
-        }?.let { AmplitudeAnalyticsHandler(it) }
+        override fun build(data: AnalyticsHandlerBuilder.Data): AnalyticsHandler {
+            return AmplitudeAnalyticsHandler(
+                client = if (data.logConfig.amplitude) {
+                    AmplitudeLogClient(data.jsonConverter)
+                } else {
+                    AmplitudeClient(data.application, data.config.amplitudeApiKey)
+                },
+            )
+        }
     }
 }
\ No newline at end of file