diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67394405d..2cfa5ede6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
 - relay/api: fix connection to remote without password ([#2158](https://github.com/weechat/weechat/issues/2158))
 - relay/api: fix timezone of dates sent to clients ([#2151](https://github.com/weechat/weechat/issues/2151))
 - relay/api: clear lines and nicklist on all remote buffers upon successful connection to the remote ([#2161](https://github.com/weechat/weechat/issues/2161))
+- relay/api: fix buffers synchronization with existing buffers that have been renamed on remote in the meanwhile ([#2169](https://github.com/weechat/weechat/issues/2169))
 - relay/api: fix "body_type" returned when lines or nicks of a buffer are requested
 - relay/api: fix read of one buffer line
 - relay: fix websocket permessage-deflate extension when the client doesn't send the max window bits parameters ([#1549](https://github.com/weechat/weechat/issues/1549))
diff --git a/src/plugins/relay/api/remote/relay-remote-event.c b/src/plugins/relay/api/remote/relay-remote-event.c
index 63cd0c3eb..20903c1c7 100644
--- a/src/plugins/relay/api/remote/relay-remote-event.c
+++ b/src/plugins/relay/api/remote/relay-remote-event.c
@@ -816,6 +816,8 @@ RELAY_REMOTE_EVENT_CALLBACK(buffer)
     /* if buffer exists, set properties, otherwise create buffer */
     apply_props = 1;
     ptr_buffer = event->buffer;
+    if (!ptr_buffer)
+        ptr_buffer = relay_remote_event_search_buffer (event->remote, id);
     if (!ptr_buffer)
     {
         if (weechat_asprintf (&full_name, "remote.%s.%s", event->remote->name, name) >= 0)