diff --git a/src/de/warking/bausystem/world/LagDetectorRunnable.java b/src/de/warking/bausystem/world/LagDetectorRunnable.java
index a60d2e2..4f576dd 100644
--- a/src/de/warking/bausystem/world/LagDetectorRunnable.java
+++ b/src/de/warking/bausystem/world/LagDetectorRunnable.java
@@ -22,7 +22,7 @@ class LagDetectorRunnable implements Runnable {
 
     @Override
     public void run() {
-		if (world == null) {
+		if (world == null || task.isCancelled()) {
 			task.cancel();
 			return;
 		}