diff --git a/CHANGELOG.md b/CHANGELOG.md
index 217d3d849f1..a403eae678e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 ### ⚠️ Changed
 
 ### ❌ Removed
+- Removed duplicate Index creation on PrimaryKey of `ReplyAttachmentEntity` and `AttachmentEntity`.[#5820](https://github.com/GetStream/stream-chat-android/pull/5820)
 
 ## stream-chat-android-state
 ### 🐞 Fixed
diff --git a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/AttachmentEntity.kt b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/AttachmentEntity.kt
index 19ef7f643b8..5a428cb6197 100644
--- a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/AttachmentEntity.kt
+++ b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/AttachmentEntity.kt
@@ -16,7 +16,6 @@
 
 package io.getstream.chat.android.offline.repository.domain.message.attachment.internal
 
-import androidx.room.ColumnInfo
 import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.ForeignKey
@@ -39,7 +38,6 @@ import io.getstream.chat.android.offline.repository.domain.message.internal.Mess
     indices = [Index("messageId")],
 )
 internal data class AttachmentEntity(
-    @ColumnInfo(index = true)
     @PrimaryKey
     val id: String,
     val messageId: String,
diff --git a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/ReplyAttachmentEntity.kt b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/ReplyAttachmentEntity.kt
index 154fdd17c63..baa08ce6522 100644
--- a/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/ReplyAttachmentEntity.kt
+++ b/stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/message/attachment/internal/ReplyAttachmentEntity.kt
@@ -16,7 +16,6 @@
 
 package io.getstream.chat.android.offline.repository.domain.message.attachment.internal
 
-import androidx.room.ColumnInfo
 import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.ForeignKey
@@ -39,7 +38,6 @@ import io.getstream.chat.android.offline.repository.domain.message.internal.Repl
     indices = [Index("messageId")],
 )
 internal data class ReplyAttachmentEntity(
-    @ColumnInfo(index = true)
     @PrimaryKey
     val id: String,
     val messageId: String,