diff --git a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepository.kt b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepository.kt
index f096ea46c..4e9fb7a15 100644
--- a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepository.kt
@@ -6,9 +6,10 @@
  */
 package com.nextcloud.talk.openconversations.data
 
+import com.nextcloud.talk.models.json.conversations.Conversation
 import io.reactivex.Observable
 
 interface OpenConversationsRepository {
 
-    fun fetchConversations(): Observable<OpenConversationsModel>
+    fun fetchConversations(): Observable<List<Conversation>>
 }
diff --git a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt
index 5edbf922d..3dbaf4dbb 100644
--- a/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt
+++ b/app/src/main/java/com/nextcloud/talk/openconversations/data/OpenConversationsRepositoryImpl.kt
@@ -21,23 +21,11 @@ class OpenConversationsRepositoryImpl(private val ncApi: NcApi, currentUserProvi
 
     val apiVersion = ApiUtils.getConversationApiVersion(currentUser, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V3, 1))
 
-    override fun fetchConversations(): Observable<OpenConversationsModel> {
-        return ncApi.getOpenConversations(
+    override fun fetchConversations(): Observable<List<Conversation>> {
+        val roomOverall = ncApi.getOpenConversations(
             credentials,
             ApiUtils.getUrlForOpenConversations(apiVersion, currentUser.baseUrl!!)
-        ).map { mapToOpenConversationsModel(it.ocs?.data!!) }
-    }
-
-    private fun mapToOpenConversationsModel(conversations: List<Conversation>): OpenConversationsModel {
-        return OpenConversationsModel(
-            conversations.map { conversation ->
-                OpenConversation(
-                    // conversation.roomId!!,
-                    conversation.token!!,
-                    conversation.name!!,
-                    conversation.description ?: ""
-                )
-            }
         )
+        return roomOverall.map { it.ocs?.data!! }
     }
 }