diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs
index 8cd14748..fcbe84e5 100644
--- a/ReallifeGamemode.Server/Events/Death.cs
+++ b/ReallifeGamemode.Server/Events/Death.cs
@@ -58,28 +58,27 @@ namespace ReallifeGamemode.Server.Events
         killerPosZ = -1;
         killerHeading = -1;
       }
-      else
+      else if (killer.IsLoggedIn())
       {
-        var killerUser = killer.GetUser();
-        if (killerUser == null)
+        var killerUser = killer.GetUser(dbContext);
+        if (killerUser != null)
         {
-          return;
-        }
-        killerId = killerUser.Id;
-        killerPosX = killer.Position.X;
-        killerPosY = killer.Position.Y;
-        killerPosZ = killer.Position.Z;
-        killerHeading = killer.Heading;
-        if (player.HasData("inGangWar") && killer.HasData("inGangWar"))
-        {
-          Gangwar.Gangwar.GangwarKill(killer, player);
-        }
+          killerId = killerUser.Id;
+          killerPosX = killer.Position.X;
+          killerPosY = killer.Position.Y;
+          killerPosZ = killer.Position.Z;
+          killerHeading = killer.Heading;
+          if (player.HasData("inGangWar") && killer.HasData("inGangWar"))
+          {
+            Gangwar.Gangwar.GangwarKill(killer, player);
+          }
 
-        if (player != killer)
-        {
-          Autowanted.Check_AutoWanted(killer, player);
-          string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason) + ")";
-          ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
+          if (player != killer)
+          {
+            Autowanted.Check_AutoWanted(killer, player);
+            string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + Managers.WeaponManager.GetCauseOfDeathByHash(reason) + ")";
+            ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
+          }
         }
       }
 
@@ -172,7 +171,6 @@ namespace ReallifeGamemode.Server.Events
             CauseOfDeath = reason.ToString()
           };
           dbContext.DeathLogs.Add(dead);
-          dbContext.SaveChanges();
         }
       }
       Job.JobBase job = Managers.JobManager.GetJob(player.GetUser().JobId ?? -1);
@@ -225,6 +223,7 @@ namespace ReallifeGamemode.Server.Events
           //ChatService.SendMessage(player, "Debug10");
         }
       }
+      dbContext.SaveChanges();
     }
 
     [RemoteEvent("RespawnPlayerAtHospital")]