diff --git a/data/src/main/java/com/anytypeio/anytype/data/auth/model/SyncStatus.kt b/data/src/main/java/com/anytypeio/anytype/data/auth/model/SyncStatus.kt
deleted file mode 100644
index db8d2505c5..0000000000
--- a/data/src/main/java/com/anytypeio/anytype/data/auth/model/SyncStatus.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.anytypeio.anytype.data.auth.model
-
-enum class SyncStatusEntity {
-    UNKNOWN,
-    OFFLINE,
-    SYNCING,
-    SYNCED,
-    FAILED,
-    INCOMPATIBLE_VERSION
-}
\ No newline at end of file
diff --git a/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusDataChannel.kt b/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusDataChannel.kt
index 6dcc40c89d..5e9bc6abb3 100644
--- a/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusDataChannel.kt
+++ b/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusDataChannel.kt
@@ -10,8 +10,6 @@ class ThreadStatusDataChannel(
 ) : ThreadStatusChannel {
 
     override fun observe(ctx: String): Flow<SyncStatus> {
-        return remote
-            .observe(ctx)
-            .map { status -> SyncStatus.valueOf(status.name) }
+        return remote.observe(ctx)
     }
 }
\ No newline at end of file
diff --git a/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusRemoteChannel.kt b/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusRemoteChannel.kt
index e9c623e4e1..2f3d22c74d 100644
--- a/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusRemoteChannel.kt
+++ b/data/src/main/java/com/anytypeio/anytype/data/auth/status/ThreadStatusRemoteChannel.kt
@@ -1,9 +1,9 @@
 package com.anytypeio.anytype.data.auth.status
 
-import com.anytypeio.anytype.data.auth.model.SyncStatusEntity
 import com.anytypeio.anytype.core_models.Id
+import com.anytypeio.anytype.core_models.SyncStatus
 import kotlinx.coroutines.flow.Flow
 
 interface ThreadStatusRemoteChannel {
-    fun observe(ctx: Id): Flow<SyncStatusEntity>
+    fun observe(ctx: Id): Flow<SyncStatus>
 }
\ No newline at end of file
diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/ThreadStatusMiddlewareChannel.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/ThreadStatusMiddlewareChannel.kt
index f07708c242..52dc7b36db 100644
--- a/middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/ThreadStatusMiddlewareChannel.kt
+++ b/middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/ThreadStatusMiddlewareChannel.kt
@@ -1,19 +1,19 @@
 package com.anytypeio.anytype.middleware.interactor
 
-import anytype.Event.Status.Thread.SyncStatus
-import com.anytypeio.anytype.data.auth.model.SyncStatusEntity
+import com.anytypeio.anytype.core_models.SyncStatus
 import com.anytypeio.anytype.data.auth.status.ThreadStatusRemoteChannel
 import com.anytypeio.anytype.middleware.EventProxy
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.mapNotNull
+import anytype.Event.Status.Thread.SyncStatus as MSyncStatus
 
 class ThreadStatusMiddlewareChannel(
     private val events: EventProxy,
 ) : ThreadStatusRemoteChannel {
 
-    override fun observe(ctx: String): Flow<SyncStatusEntity> = events.flow()
+    override fun observe(ctx: String): Flow<SyncStatus> = events.flow()
         .filter { it.contextId == ctx }
         .mapNotNull { emission ->
             emission
@@ -25,12 +25,12 @@ class ThreadStatusMiddlewareChannel(
         }
         .mapLatest { status ->
             when (status) {
-                SyncStatus.Unknown -> SyncStatusEntity.UNKNOWN
-                SyncStatus.Offline -> SyncStatusEntity.OFFLINE
-                SyncStatus.Syncing -> SyncStatusEntity.SYNCING
-                SyncStatus.Synced -> SyncStatusEntity.SYNCED
-                SyncStatus.Failed -> SyncStatusEntity.FAILED
-                SyncStatus.IncompatibleVersion -> SyncStatusEntity.INCOMPATIBLE_VERSION
+                MSyncStatus.Unknown -> SyncStatus.UNKNOWN
+                MSyncStatus.Offline -> SyncStatus.OFFLINE
+                MSyncStatus.Syncing -> SyncStatus.SYNCING
+                MSyncStatus.Synced -> SyncStatus.SYNCED
+                MSyncStatus.Failed -> SyncStatus.FAILED
+                MSyncStatus.IncompatibleVersion -> SyncStatus.INCOMPATIBLE_VERSION
             }
         }
 }
\ No newline at end of file