diff --git a/code/datums/event_info_text.dm b/code/datums/event_info_text.dm
index 5336c5abed9d..21469ed379cd 100644
--- a/code/datums/event_info_text.dm
+++ b/code/datums/event_info_text.dm
@@ -15,7 +15,6 @@
 			return
 
 	if(msg == "")
-		to_chat(user, SPAN_WARNING("No [faction] custom event message has been found. Either no custom event is taking place, admin hasn't properly set this or deemed it unnecessary to be set."))
 		return
 
 	var/dat
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 4b25d7a2ae39..7ec4a7f2781c 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -32,7 +32,7 @@
 		var/author = lobby_authors[GLOB.displayed_lobby_art]
 		if(author != "Unknown")
 			to_chat(src, SPAN_ROUNDBODY("<hr>This round's lobby art is brought to you by [author]<hr>"))
-	if(GLOB.join_motd)
-		to_chat(src, "<div class=\"motd\">[GLOB.join_motd]</div>")
 	if(GLOB.current_tms)
 		to_chat(src, SPAN_BOLDANNOUNCE(GLOB.current_tms))
+	if(GLOB.join_motd)
+		to_chat(src, "<div class=\"motd\">[GLOB.join_motd]</div>")