diff --git a/degesch.c b/degesch.c
index 2f010d2..cdbc473 100644
--- a/degesch.c
+++ b/degesch.c
@@ -5194,6 +5194,10 @@ irc_get_buffer_for_message (struct server *s,
 	}
 	else if (!buffer)
 	{
+		// Outgoing messages needn't have a prefix, no buffer associated
+		if (!msg->prefix)
+			return NULL;
+
 		// Don't make user buffers for servers (they can send NOTICEs)
 		if (!irc_find_userhost (msg->prefix))
 			return s->buffer;