diff --git a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java
index 514ab826c..5cab00d14 100644
--- a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java
+++ b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java
@@ -37,11 +37,11 @@ public class GlobalEventManager implements CallBack {
 					if (ticksRemaining > 0) {
 						event.tick();
 						--ticksRemaining;
-						if (ticksRemaining % 3000 == 0)
-							message("You have " + Math.round(ticksRemaining / 100) + " minutes before the " + event.getName() + " event ends.");
-							
 						if (ticksRemaining <= 0)
 							message("The " + event.getName() + " event has now ended.");
+						else if (ticksRemaining % 3000 == 0)
+							message("You have " + Math.round(ticksRemaining / 100) + " minutes before the " + event.getName() + " event ends.");
+							
 					}
 				}