diff --git a/file/lib/data/message/Message.class.php b/file/lib/data/message/Message.class.php
index ab59b6b..919ba70 100644
--- a/file/lib/data/message/Message.class.php
+++ b/file/lib/data/message/Message.class.php
@@ -149,13 +149,12 @@ class Message extends \chat\data\CHATDatabaseObject {
 			case self::TYPE_INFORMATION:
 				$separator = ':';
 			break;
-			case self::TYPE_JOIN:
-				unset($additionalData['ipAddress']);
-			break;
 			default:
 				$separator = '';
 			break;
 		}
+
+		if ($this->type == self::TYPE_JOIN) unset($additionalData['ipAddress']);
 		
 		$time = \wcf\util\DateUtil::getDateTimeByTimestamp($this->time);
 		$startOfDay = new \DateTime('today', WCF::getUser()->getTimezone());