diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 0835d25460c..b913ba9e0a3 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -3694,7 +3694,7 @@ Passwords are stored in `rcirc-authinfo' (which see)."
   "Notify user of an invitation from SENDER.
 ARGS should have the form (TARGET CHANNEL).  PROCESS is the
 process object for the current connection."
-  (let ((self (buffer-local-value 'rcirc-nick rcirc-process))
+  (let ((self (with-rcirc-process-buffer process rcirc-nick))
         (target (car args))
         (chan (cadr args)))
     ;; `rcirc-channel-filter' is not used here because joining