diff --git a/ChangeLog b/ChangeLog
index 0ce8ea03d..a01dd97d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,7 +43,8 @@ Version 0.3.7 (under dev!)
   hashtable_map_string, hdata_check_pointer, hdata_char, hdata_hashtable and
   nicklist_get_next_item
 * irc: use redirection to get channel modes after update of modes on channel,
-  display output of /mode #channel
+  display output of /mode #channel, allow /mode without argument (display modes
+  of current channel or user modes on server buffer)
 * irc: do not use option irc.look.nick_color_stop_chars for forced nick colors
   (bug #33480)
 * irc: add optional server in info "irc_is_channel" (before channel name)
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 869519025..f7df667f2 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -2434,7 +2434,10 @@ irc_command_mode (void *data, struct t_gui_buffer *buffer, int argc,
     }
     else
     {
-        IRC_COMMAND_TOO_FEW_ARGUMENTS(ptr_server->buffer, "mode");
+        if (ptr_channel)
+            irc_command_mode_server (ptr_server, ptr_channel, NULL);
+        else
+            irc_command_mode_server (ptr_server, NULL, ptr_server->nick);
     }
 
     return WEECHAT_RC_OK;