diff --git a/src/fe-common/irc/fe-irc-messages.c b/src/fe-common/irc/fe-irc-messages.c
index 36194a9b..fb8d1e94 100644
--- a/src/fe-common/irc/fe-irc-messages.c
+++ b/src/fe-common/irc/fe-irc-messages.c
@@ -69,9 +69,11 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
 	const char *oldtarget;
 	char *nickmode;
 
+	if (!IS_IRC_SERVER(server))
+		return;
 	oldtarget = target;
 	target = skip_target(IRC_SERVER(server), target);
-	if (IS_IRC_SERVER(server) && target != oldtarget) {
+	if (target != oldtarget) {
 		/* Hybrid 6 / Bahamut feature, send msg to all
 		   ops / ops+voices in channel */
 		nickmode = channel_get_nickmode(channel_find(server, target),