diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index b1564065..4b1a9fe1 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -305,7 +305,7 @@ namespace ReallifeGamemode.Server.Commands
             target.SetSharedData("blipColor", 5);
             break;
         }
-
+        target.TriggerEvent("jailTime", 0);
 
         targetUser.Wanteds = 0;
         dbContext.SaveChanges();
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index 2c61e15c..11bd0769 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -22,22 +22,6 @@ namespace ReallifeGamemode.Server.Wanted
       User user = client.GetUser();
       if (user.JailTime > 0)
       {
-        switch (user.FactionId)
-        {
-          case null:
-            client.SetSharedData("blipColor", 0);
-            break;
-          case 8:
-            client.SetSharedData("blipColor", 83);
-            break;
-          case 7:
-            client.SetSharedData("blipColor", 52);
-            break;
-          case 4:
-            client.SetSharedData("blipColor", 5);
-            break;
-
-        }
         client.RemoveAllWeapons();
         client.Health = 100;
         client.Armor = 0;
@@ -106,6 +90,22 @@ namespace ReallifeGamemode.Server.Wanted
             client.TriggerEvent("jailTime", timeMinutes);
             ChatService.SendMessage(client, "!{#FF614A}* Du bist nun im Gefängnis für " + jailTime + " Sekunden.");
             ChatService.BroadcastFaction("!{#8181E9}HQ: " + user.Name + " wurde ins Gefängnis geliefert.", new List<int>() { 1, 3 });
+            switch (user.FactionId)
+            {
+              case null:
+                client.SetSharedData("blipColor", 0);
+                break;
+              case 8:
+                client.SetSharedData("blipColor", 83);
+                break;
+              case 7:
+                client.SetSharedData("blipColor", 52);
+                break;
+              case 4:
+                client.SetSharedData("blipColor", 5);
+                break;
+
+            }
           }          
         }
       }
@@ -166,6 +166,7 @@ namespace ReallifeGamemode.Server.Wanted
             user = player.GetUser(dbContext);
             user.JailTime = 0;
             user.GiveWanteds(null, 50, "Knast-Ausbruch");
+            player.TriggerEvent("jailTime", 0);
             dbContext.SaveChanges();
             Jailtime.Remove(user.Id);
           }
@@ -184,8 +185,8 @@ namespace ReallifeGamemode.Server.Wanted
 
           if (user.JailTime <= 0)
           {
-            player.Position = new Vector3(461.7256, -988.6035, 24.91487);
             Jailtime.Remove(user.Id);
+            player.Position = new Vector3(461.7256, -988.6035, 24.91487);          
             return;
           }
           if (user.JailTime > 0)