diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiver.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiver.kt
index 31ff54e6e9b..b6374b27218 100644
--- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiver.kt
+++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiver.kt
@@ -47,7 +47,9 @@ internal class UserPropertiesEventReceiverImpl internal constructor(
             }
 
             is Event.UserProperty.FoldersUpdate -> {
-                handleFoldersUpdate(event)
+                Either.Right(Unit)
+                // TODO will be handled in 4.11.0
+//                 handleFoldersUpdate(event)
             }
         }
     }
diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiverTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiverTest.kt
index af93f739d10..30bba00a160 100644
--- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiverTest.kt
+++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserPropertiesEventReceiverTest.kt
@@ -24,8 +24,6 @@ import com.wire.kalium.logic.framework.TestEvent
 import com.wire.kalium.logic.functional.Either
 import io.mockative.Mock
 import io.mockative.any
-import io.mockative.coEvery
-import io.mockative.coVerify
 import io.mockative.every
 import io.mockative.mock
 import io.mockative.once
@@ -49,19 +47,19 @@ class UserPropertiesEventReceiverTest {
         }.wasInvoked(exactly = once)
     }
 
-    @Test
-    fun givenFoldersUpdateEvent_repositoryIsInvoked() = runTest {
-        val event = TestEvent.foldersUpdate()
-        val (arrangement, eventReceiver) = Arrangement()
-            .withUpdateConversationFolders()
-            .arrange()
-
-        eventReceiver.onEvent(event, TestEvent.liveDeliveryInfo)
-
-        coVerify {
-            arrangement.conversationFolderRepository.updateConversationFolders(any())
-        }.wasInvoked(exactly = once)
-    }
+//     @Test
+//     fun givenFoldersUpdateEvent_repositoryIsInvoked() = runTest {
+//         val event = TestEvent.foldersUpdate()
+//         val (arrangement, eventReceiver) = Arrangement()
+//             .withUpdateConversationFolders()
+//             .arrange()
+//
+//         eventReceiver.onEvent(event, TestEvent.liveDeliveryInfo)
+//
+//         coVerify {
+//             arrangement.conversationFolderRepository.updateConversationFolders(any())
+//         }.wasInvoked(exactly = once)
+//     }
 
     private class Arrangement {
 
@@ -82,11 +80,11 @@ class UserPropertiesEventReceiverTest {
             }.returns(Either.Right(Unit))
         }
 
-        suspend fun withUpdateConversationFolders() = apply {
-            coEvery {
-                conversationFolderRepository.updateConversationFolders(any())
-            }.returns(Either.Right(Unit))
-        }
+//         suspend fun withUpdateConversationFolders() = apply {
+//             coEvery {
+//                 conversationFolderRepository.updateConversationFolders(any())
+//             }.returns(Either.Right(Unit))
+//         }
 
         fun arrange() = this to userPropertiesEventReceiver
     }