diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 7407a55e31..451cb24030 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -118,15 +118,17 @@
 			update_display(line1, line2)
 			return 1
 		if(STATUS_DISPLAY_TIME)
-			update_display("TIME", worldtime2text())
+			message1 = "TIME"
+			message2 = worldtime2text()
+			update_display(message1, message2)
+			return 1
 	return 0
 
 /obj/machinery/status_display/examine()
 	set src in view()
 	. = ..()
-	switch(mode)
-		if(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME,2)
-			usr << "The display says:<br>\t<xmp>[message1]</xmp><br>\t<xmp>[message2]</xmp>"
+	if(mode != STATUS_DISPLAY_BLANK && mode != STATUS_DISPLAY_ALERT)
+		usr << "The display says:<br>\t[sanitize(message1)]<br>\t[sanitize(message2)]"
 
 /obj/machinery/status_display/proc/set_message(m1, m2)
 	if(m1)
diff --git a/code/game/machinery/supply_display.dm b/code/game/machinery/supply_display.dm
index e9a5065907..aacd770d79 100644
--- a/code/game/machinery/supply_display.dm
+++ b/code/game/machinery/supply_display.dm
@@ -27,12 +27,6 @@
 		return 1
 	return 0
 
-/obj/machinery/status_display/supply_display/examine()
-	if(mode == STATUS_DISPLAY_CUSTOM)
-		usr << "The display says:<br>\t<xmp>[message1]</xmp><br>\t<xmp>[message2]</xmp>"
-	else
-		..()
-
 /obj/machinery/status_display/supply_display/receive_signal/(datum/signal/signal)
 	if(signal.data["command"] == "supply")
 		mode = STATUS_DISPLAY_CUSTOM