diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index 9bf1e7e5..d20bdb82 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -169,6 +169,7 @@ namespace ReallifeGamemode.Server.Wanted
           if (user.JailTime <= 0)
           {
             player.Position = new Vector3(461.7256, -988.6035, 24.91487);
+            player.TriggerEvent("jailTime", 0);
             Jailtime.Remove(user.Id);
             return;
           }
@@ -217,17 +218,9 @@ namespace ReallifeGamemode.Server.Wanted
         }
         player.Health = 100;
         player.Position = new Vector3(461.7256, -988.6035, 24.91487);
-        foreach (var copPlayer in NAPI.Pools.GetAllPlayers())
-        {
-          User copUser = copPlayer.GetUser();
-          if ((copUser.FactionId == 1 || copUser.FactionId == 3))
-          {
-            player.TriggerEvent("jailTime", 0);
-            ChatService.SendMessage(copPlayer, "!{#8181E9}HQ: Beamter " + cop.Name + " hat " + user.Name + " aus dem Knast entlassen.");
-            ChatService.SendMessage(player, "Der Beamte " + cop.Name + " hat dich aus dem Knast entlassen");
-          }
 
-        }
+        ChatService.HQMessage("Beamter " + cop.Name + " hat " + user.Name + " aus dem Knast entlassen.");
+        player.TriggerEvent("jailTime", 0);
       }
     }
     
@@ -249,6 +242,7 @@ namespace ReallifeGamemode.Server.Wanted
         ChatService.HQMessage("Admin " + admin.Name + " hat " + user.Name + " aus dem Knast entlassen.");
         ChatService.SendMessage(target, "Admin " + admin.Name + " hat dich aus dem Knast entlassen");
         ChatService.SendMessage(admin, "Du hast " + user.Name + " administrativ aus dem Knast entlassen");
+        target.TriggerEvent("jailTime", 0);
       }
     }
   }