diff --git a/degesch.c b/degesch.c
index 641629c..216ea0a 100644
--- a/degesch.c
+++ b/degesch.c
@@ -11042,7 +11042,7 @@ handle_command_query (struct handler_args *a)
 	if (irc_is_channel (a->s, irc_skip_statusmsg (a->s, target)))
 		log_server_error (a->s, a->s->buffer, "Cannot query a channel");
 	else if (!*a->arguments)
-		log_server_error (a->s, a->s->buffer, "No text to send");
+		buffer_activate (a->ctx, irc_get_or_make_user_buffer (a->s, target));
 	else
 	{
 		buffer_activate (a->ctx, irc_get_or_make_user_buffer (a->s, target));