diff --git a/world/zonelist.cpp b/world/zonelist.cpp
index c2db3676e..96c30c9d0 100644
--- a/world/zonelist.cpp
+++ b/world/zonelist.cpp
@@ -111,7 +111,7 @@ void ZSList::Process() {
 			0,
 			0,
 			AccountStatus::Player,
-			Chat::Yellow,
+			Chat::System,
 			fmt::format(
 				"[SYSTEM] World will be shutting down in {} minutes.",
 				((shutdowntimer->GetRemainingTime() / 1000) / 60)
@@ -759,7 +759,7 @@ void ZSList::WorldShutDown(uint32 time, uint32 interval)
 			0,
 			0,
 			AccountStatus::Player,
-			Chat::Yellow,
+			Chat::System,
 			fmt::format(
 				"[SYSTEM] World will be shutting down in {} minutes.",
 				(time / 60)
diff --git a/zone/gm_commands/worldshutdown.cpp b/zone/gm_commands/worldshutdown.cpp
index e42bcd29a..37940d1a7 100755
--- a/zone/gm_commands/worldshutdown.cpp
+++ b/zone/gm_commands/worldshutdown.cpp
@@ -17,7 +17,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 			) {
 			int time_minutes = (time / 60);
 			quest_manager.WorldWideMessage(
-				Chat::Yellow,
+				Chat::System,
 				fmt::format(
 					"[SYSTEM] World will be shutting down in {} minutes.",
 					time_minutes