diff --git a/src/app_service/service/mailservers/service.nim b/src/app_service/service/mailservers/service.nim
index 3dbd97235f..6a43989615 100644
--- a/src/app_service/service/mailservers/service.nim
+++ b/src/app_service/service/mailservers/service.nim
@@ -35,8 +35,7 @@ const requestMoreMessagesTask: Task = proc(argEncoded: string) {.gcsafe, nimcall
     info "Requesting additional message history for chat", chatId=arg.chatId
     discard status_mailservers.syncChatFromSyncedFrom(arg.chatId)
   except Exception as e:
-    warn "Disconnecting active mailserver due to error", errDescription=e.msg
-    discard status_mailservers.disconnectActiveMailserver()
+    warn "Could not request additional messages due to error", errDescription=e.msg
 
 const fillGapsTask: Task = proc(argEncoded: string) {.gcsafe, nimcall.} =
   let arg = decode[FillGapsTaskArg](argEncoded)
@@ -44,8 +43,7 @@ const fillGapsTask: Task = proc(argEncoded: string) {.gcsafe, nimcall.} =
     info "Requesting fill gaps", chatId=arg.chatId, messageIds=arg.messageIds
     discard status_mailservers.fillGaps(arg.chatId, arg.messageIds)
   except Exception as e:
-    warn "Disconnecting active mailserver due to error", errDescription=e.msg
-    discard status_mailservers.disconnectActiveMailserver()
+    warn "Could not fill gaps due to error", errDescription=e.msg
 
 QtObject:
   type Service* = ref object of QObject
diff --git a/src/backend/mailservers.nim b/src/backend/mailservers.nim
index d06429d14d..bfddcd6aeb 100644
--- a/src/backend/mailservers.nim
+++ b/src/backend/mailservers.nim
@@ -29,8 +29,3 @@ proc fillGaps*(chatId: string, messageIds: seq[string]): RpcResponse[JsonNode] {
   let payload = %*[chatId, messageIds]
   result = core.callPrivateRPC("fillGaps".prefix, payload)
   info "fillGaps", topics="mailserver-interaction", rpc_method="wakuext_fillGaps", chatId, messageIds, result
-
-proc disconnectActiveMailserver*(): RpcResponse[JsonNode] {.raises: [Exception].} =
-  let payload = %* []
-  result = core.callPrivateRPC("disconnectActiveMailserver".prefix, payload)
-  info "delete", topics="mailserver-interaction", rpc_method="wakuext_disconnectActiveMailserver", result