diff --git a/app/src/main/java/org/futo/circles/feature/home/HomeFragment.kt b/app/src/main/java/org/futo/circles/feature/home/HomeFragment.kt
index 66f853d2c27a720611e53b3ed36408876e21c867..08a4127f10c9f3c02cbd6ebfd7cef2b24ea26426 100644
--- a/app/src/main/java/org/futo/circles/feature/home/HomeFragment.kt
+++ b/app/src/main/java/org/futo/circles/feature/home/HomeFragment.kt
@@ -116,9 +116,6 @@ class HomeFragment : Fragment(R.layout.fragment_bottom_navigation), DeepLinkInte
     }
 
     private fun setupObservers() {
-        viewModel.inviteIntoSharedSpaceLiveData?.observeData(this) {
-            viewModel.autoAcceptInviteOnKnock(it)
-        }
         viewModel.mediaBackupSettingsLiveData?.observeData(this) {
             mediaBackupServiceManager.bindMediaServiceIfNeeded(requireContext(), it)
         }
diff --git a/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt b/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
index 4a234e39a5263b69f0e4ca52a5757633a228820f..b8e6a00c8c0fd5628adc878f9f922b9213abe607 100644
--- a/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
+++ b/app/src/main/java/org/futo/circles/feature/people/UserOptionsDataSource.kt
@@ -25,7 +25,6 @@ class UserOptionsDataSource @Inject constructor(
         sharedCircleDataSource.getSharedCircleFor(userId) != null
 
     suspend fun unFollowUser(userId: String): Response<Unit?> = createResult {
-        MatrixSessionProvider.currentSession?.roomService()
-            ?.leaveRoom(sharedCircleDataSource.getSharedCircleFor(userId)?.roomId ?: "")
+        sharedCircleDataSource.unfollowUsersSharedCircle(userId)
     }
 }
\ No newline at end of file