diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
index dda8201..b1a794a 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
@@ -631,7 +631,7 @@ interface MastodonApi {
             @Path("message_id") messageId: String
     ): Single<ChatMessage>
 
-    @GET("api/v1/pleroma/chats")
+    @GET("api/v2/pleroma/chats")
     fun getChats(
             @Query("max_id") maxId: String?,
             @Query("min_id") minId: String?,
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt b/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt
index d96df4c..6fa19c3 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/repository/ChatRepository.kt
@@ -59,24 +59,24 @@ class ChatRepositoryImpl(
             getChatMessagesFromNetwork(chatId, maxId, sinceId, sincedIdMinusOne, limit, accountId, requestMode)
         }*/
 
-        return getChatMessagesFromNetwork(chatId, maxId, sinceId, sincedIdMinusOne, limit, accountId, requestMode)
+        return getChatMessagesFromNetwork(chatId, maxId, null, null, limit, accountId, requestMode)
     }
 
     private fun getChatsFromNetwork(maxId: String?, sinceId: String?,
                                        sinceIdMinusOne: String?, limit: Int,
                                        accountId: Long, requestMode: TimelineRequestMode
     ): Single<out List<ChatStatus>> {
-        return mastodonApi.getChats(maxId, null, sinceIdMinusOne, 0, limit + 1)
-                .map { chats ->
-                    this.saveChatsToDb(accountId, chats, maxId, sinceId)
-                }
-                .flatMap { chats ->
-                    this.addFromDbIfNeeded(accountId, chats, maxId, sinceId, limit, requestMode)
-                }
-                .onErrorResumeNext { error ->
-                    if (error is IOException && requestMode != NETWORK) {
-                        this.getChatsFromDb(accountId, maxId, sinceId, limit)
-                    } else {
+        return mastodonApi.getChats(null, null, sinceIdMinusOne, 0, limit + 1)
+            .map { chats ->
+                this.saveChatsToDb(accountId, chats, maxId, sinceId)
+            }
+            .flatMap { chats ->
+                this.addFromDbIfNeeded(accountId, chats, maxId, sinceId, limit, requestMode)
+            }
+            .onErrorResumeNext { error ->
+                if (error is IOException && requestMode != NETWORK) {
+                    this.getChatsFromDb(accountId, maxId, sinceId, limit)
+                } else {
                         Single.error(error)
                     }
                 }