diff --git a/changelog.d/5142.bugfix b/changelog.d/5142.bugfix
new file mode 100644
index 0000000000..787a171c3c
--- /dev/null
+++ b/changelog.d/5142.bugfix
@@ -0,0 +1 @@
+Analytics: aligns use case identifying with iOS implementation
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
index 62d360f5f7..31df1fa055 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
@@ -176,7 +176,7 @@ class DefaultVectorAnalytics @Inject constructor(
     }
 
     override fun updateUserProperties(identity: Identity) {
-        posthog?.identify(REUSE_EXISTING_ID, identity.getProperties().toPostHogProperties(), IGNORED_OPTIONS)
+        posthog?.identify(REUSE_EXISTING_ID, identity.getProperties()?.toPostHogUserProperties(), IGNORED_OPTIONS)
     }
 
     private fun Map<String, Any?>?.toPostHogProperties(): Properties? {
@@ -186,4 +186,14 @@ class DefaultVectorAnalytics @Inject constructor(
             putAll(this@toPostHogProperties)
         }
     }
+
+    /**
+     * We avoid sending nulls as part of the UserProperties as this will reset the values across all devices
+     * The Identify event has nullable properties to allow for clients to opt in
+     */
+    private fun Map<String, Any?>.toPostHogUserProperties(): Properties {
+        return Properties().apply {
+            putAll(this@toPostHogUserProperties.filter { it.value != null })
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 8097e90206..a4afe36c6c 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -465,13 +465,11 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun handleUpdateUseCase(action: OnboardingAction.UpdateUseCase) {
         setState { copy(useCase = action.useCase) }
-        analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = action.useCase.toTrackingValue()))
         _viewEvents.post(OnboardingViewEvents.OpenServerSelection)
     }
 
     private fun resetUseCase() {
         setState { copy(useCase = null) }
-        analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = null))
     }
 
     private fun handleUpdateServerType(action: OnboardingAction.UpdateServerType) {
@@ -754,6 +752,7 @@ class OnboardingViewModel @AssistedInject constructor(
     private suspend fun onSessionCreated(session: Session) {
         awaitState().useCase?.let { useCase ->
             session.vectorStore(applicationContext).setUseCase(useCase)
+            analyticsTracker.updateUserProperties(Identity(ftueUseCaseSelection = useCase.toTrackingValue()))
         }
         activeSessionHolder.setActiveSession(session)