diff --git a/degesch.c b/degesch.c
index 0cac7d3..8221cb8 100644
--- a/degesch.c
+++ b/degesch.c
@@ -2168,9 +2168,9 @@ irc_handle_quit (struct app_context *ctx, const struct irc_message *msg)
 	LIST_FOR_EACH (struct user_channel, iter, user->channels)
 	{
 		buffer = str_map_find (&ctx->irc_buffer_map, iter->channel->name);
-		hard_assert (buffer != NULL);
-		buffer_send (ctx, buffer, BUFFER_LINE_QUIT, 0,
-			msg->prefix, message, "");
+		if (buffer)
+			buffer_send (ctx, buffer, BUFFER_LINE_QUIT, 0,
+				msg->prefix, message, "");
 
 		// Unlink the user from the channel
 		struct channel *channel = iter->channel;