diff --git a/ChangeLog b/ChangeLog
index 1660a4e0d..b04bf46a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ Version 0.4.0 (under dev!)
   hook_connect, move "sock" from hook_connect arguments to callback of
   hook_connect (task #11205)
 * aspell: add bar item "aspell_dict" (dictionary used on current buffer)
+* irc: remove local variable "away" in server/channels buffers after server
+  disconnection (bug #37582)
 * irc: add option "-noswitch" for command /join (task #12275)
 * irc: fix crash when message 352 has too few arguments (bug #37513)
 * irc: remove unneeded server disconnect when server buffer is closed and server
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 49826c63d..43b8f213c 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -3930,11 +3930,14 @@ irc_server_disconnect (struct t_irc_server *server, int switch_address,
                 weechat_unhook (ptr_channel->hook_autorejoin);
                 ptr_channel->hook_autorejoin = NULL;
             }
+            weechat_buffer_set (ptr_channel->buffer, "localvar_del_away", "");
             weechat_printf (ptr_channel->buffer,
                             _("%s%s: disconnected from server"),
                             weechat_prefix ("network"),
                             IRC_PLUGIN_NAME);
         }
+        /* remove away status on server buffer */
+        weechat_buffer_set (server->buffer, "localvar_del_away", "");
     }
 
     irc_server_close_connection (server);