diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index bb68173b6d..a23f3e3b0d 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -6413,8 +6413,12 @@ erc-format-target-and/or-network
     (when (and network-name (symbolp network-name))
       (setq network-name (symbol-name network-name)))
     (cond ((erc-default-target)
-           (concat (erc-string-no-properties (erc-default-target))
-                   "@" network-name))
+           (let ((name (concat (erc-string-no-properties
+                                (erc-default-target))
+                               "@" network-name)))
+             (if erc-rename-buffers
+                 (rename-buffer name)
+               name)))
           ((and network-name
                 (not (get-buffer network-name)))
            (when erc-rename-buffers