diff --git a/analytics/src/main/java/com/anytypeio/anytype/analytics/tracker/AmplitudeTracker.kt b/analytics/src/main/java/com/anytypeio/anytype/analytics/tracker/AmplitudeTracker.kt
index ce728b951f..d5834ba652 100644
--- a/analytics/src/main/java/com/anytypeio/anytype/analytics/tracker/AmplitudeTracker.kt
+++ b/analytics/src/main/java/com/anytypeio/anytype/analytics/tracker/AmplitudeTracker.kt
@@ -36,6 +36,9 @@ class AmplitudeTracker(
         analytics
             .observeEvents()
             .collect { event ->
+                if (BuildConfig.DEBUG) {
+                    Timber.d("Analytics Amplitude(event = $event)")
+                }
                 if (BuildConfig.SEND_EVENTS && event is EventAnalytics.Anytype) {
                     val props = event.props.getEventProperties(
                         startTime = event.duration?.start,
@@ -43,9 +46,6 @@ class AmplitudeTracker(
                         renderTime = event.duration?.render
                     )
                     tracker.logEvent(event.name, props)
-                    if (BuildConfig.DEBUG) {
-                        Timber.d("Analytics Amplitude(event = $event)")
-                    }
                 }
             }
     }
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/onboarding/OnboardingFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/onboarding/OnboardingFragment.kt
index 637d73de66..d7e64f9fcd 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/onboarding/OnboardingFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/onboarding/OnboardingFragment.kt
@@ -538,7 +538,6 @@ class OnboardingFragment : Fragment() {
                         navController.navigate(
                             route = OnboardingNavigation.createSoulAnim
                         )
-                        vm.sendAnalyticsOnboardingScreen()
                     }
                 }
             }
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/signup/OnboardingSoulCreationViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/signup/OnboardingSoulCreationViewModel.kt
index 48a52fa7f3..b777ccb65b 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/signup/OnboardingSoulCreationViewModel.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/onboarding/signup/OnboardingSoulCreationViewModel.kt
@@ -35,6 +35,9 @@ class OnboardingSoulCreationViewModel @Inject constructor(
         val config = configStorage.getOrNull()
         if (config != null) {
             viewModelScope.launch {
+                sendAnalyticsOnboardingScreenEvent(analytics,
+                    EventsDictionary.ScreenOnboardingStep.SOUL_CREATING
+                )
                 setObjectDetails.async(
                     SetObjectDetails.Params(
                         ctx = config.profile, details = mapOf(Relations.NAME to name)
@@ -59,6 +62,10 @@ class OnboardingSoulCreationViewModel @Inject constructor(
         val config = configStorage.getOrNull()
         if (config != null) {
             viewModelScope.launch {
+                sendAnalyticsOnboardingScreenEvent(
+                    analytics = analytics,
+                    step = EventsDictionary.ScreenOnboardingStep.SPACE_CREATING
+                )
                 setObjectDetails.async(
                     SetObjectDetails.Params(
                         ctx = config.workspace,
@@ -69,10 +76,6 @@ class OnboardingSoulCreationViewModel @Inject constructor(
                         Timber.e(it, "Error while updating object details")
                     },
                     onSuccess = {
-                        sendAnalyticsOnboardingScreenEvent(
-                            analytics = analytics,
-                            step = EventsDictionary.ScreenOnboardingStep.SPACE_CREATING
-                        )
                         _navigationFlow.emit(Navigation.OpenSoulCreationAnim(name))
                     }
                 )
@@ -88,12 +91,6 @@ class OnboardingSoulCreationViewModel @Inject constructor(
         viewModelScope.launch { toasts.emit(msg) }
     }
 
-    fun sendAnalyticsOnboardingScreen() {
-        viewModelScope.sendAnalyticsOnboardingScreenEvent(analytics,
-            EventsDictionary.ScreenOnboardingStep.SOUL_CREATING
-        )
-    }
-
     sealed interface Navigation {
         class OpenSoulCreationAnim(val name: String): Navigation
     }