diff --git a/data/src/main/java/com/canopas/yourspace/data/repository/SpaceRepository.kt b/data/src/main/java/com/canopas/yourspace/data/repository/SpaceRepository.kt
index 2ed304d4..a83e5312 100644
--- a/data/src/main/java/com/canopas/yourspace/data/repository/SpaceRepository.kt
+++ b/data/src/main/java/com/canopas/yourspace/data/repository/SpaceRepository.kt
@@ -228,11 +228,10 @@ class SpaceRepository @Inject constructor(
 
     suspend fun leaveSpace(spaceId: String) {
         val userId = authService.currentUser?.id
-        if (userId != null) {
-            spaceService.removeUserFromSpace(spaceId, userId)
-        }
-        if (userId != null) {
-            updateUserSpaceId(userId, spaceId)
+
+        userId?.let { uid ->
+            spaceService.removeUserFromSpace(spaceId, uid)
+            updateUserSpaceId(uid, spaceId)
         }
     }