diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
index e312cb08..9ae8b7f1 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java
@@ -57,11 +57,13 @@ public class TraceCommand extends SWCommand {
     public void stop(@Validator Player player) {
         Region region = Region.getRegion(player.getLocation());
         TraceRecorder.instance.stopRecording(region);
-        BauSystem.MESSAGE.send("TRACE_MESSAGE_STOP", player);
+
 
         if (TraceRecorder.instance.isAutoTraceEnabledInRegion(region)) {
             TraceRecorder.instance.removeAutoTraceRegion(region);
             BauSystem.MESSAGE.send("TRACE_MESSAGE_AUTO_STOP", player);
+        } else {
+            BauSystem.MESSAGE.send("TRACE_MESSAGE_STOP", player);
         }
     }