diff --git a/ReallifeGamemode.Client/Gui/infobox.ts b/ReallifeGamemode.Client/Gui/infobox.ts
index 21328555..b43f9cdd 100644
--- a/ReallifeGamemode.Client/Gui/infobox.ts
+++ b/ReallifeGamemode.Client/Gui/infobox.ts
@@ -216,7 +216,7 @@ export default function (globalData: GlobalData): void {
                 })
 
             if (jailTime > 0) {
-                mp.game.graphics.drawText("~y~Knastzeit: " + jailTime + " Minuten", [0.9, 0.55],
+                mp.game.graphics.drawText("~y~Knastzeit: " + jailTime + " Minuten", [0.92, 0.52],
                     {
                         font: 4,
                         color: [255, 255, 255, 255],
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index 9a9bcf4f..8caaec9e 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -76,7 +76,18 @@ namespace ReallifeGamemode.Server.Wanted
             Medic.RemoveTaskFromList(task);
             client.Health = 100;
 
-            client.TriggerEvent("jailTime", (int)(jailTime / 60));
+            int t = 0;
+
+            if (((int)(user.JailTime / 60)) == 0)
+            {
+              t = 1;
+            }
+            else
+            {
+              t = (int)(user.JailTime / 60);
+            }
+
+            client.TriggerEvent("jailTime", t);
             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 });
           }          
@@ -169,7 +180,17 @@ namespace ReallifeGamemode.Server.Wanted
               dbContext.SaveChanges();
             }
 
-            player.TriggerEvent("jailTime", (int)(user.JailTime / 60));
+            int t = 0;
+
+            if (((int)(user.JailTime / 60)) == 0)
+            {
+              t = 1;
+            } else
+            {
+              t = (int)(user.JailTime / 60);
+            }
+
+            player.TriggerEvent("jailTime", t);
             player.Health = 100;
           }
         }