diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 65fef3ef..c6bfaef2 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -127,7 +127,8 @@ static void signal_query_nick_changed(QUERY_REC *query, const char *oldnick)
 	/* don't print the nick change message if only the case was changed */
 	if (g_strcasecmp(query->name, oldnick) != 0) {
 		printformat_dest(&dest,  TXT_NICK_CHANGED, oldnick,
-				 query->name, query->name, query->address);
+				 query->name, query->name,
+				 query->address == NULL ? "" : query->address);
 	}
 
 	signal_emit("window item changed", 2,