diff --git a/TowerForge/TowerForge/Achievements/Implemented/TotalKillsAchievement.swift b/TowerForge/TowerForge/Achievements/Implemented/TotalKillsAchievement.swift
index 4996a2aa..79adeca1 100644
--- a/TowerForge/TowerForge/Achievements/Implemented/TotalKillsAchievement.swift
+++ b/TowerForge/TowerForge/Achievements/Implemented/TotalKillsAchievement.swift
@@ -1,5 +1,5 @@
 //
-//  SampleAchievement.swift
+//  TotalKillsAchievement.swift
 //  TowerForge
 //
 //  Created by Rubesh on 27/3/24.
diff --git a/TowerForge/TowerForge/GameModule/Events/GameEvents/KillEvent.swift b/TowerForge/TowerForge/GameModule/Events/GameEvents/KillEvent.swift
index 93b8ed9e..c551d278 100644
--- a/TowerForge/TowerForge/GameModule/Events/GameEvents/KillEvent.swift
+++ b/TowerForge/TowerForge/GameModule/Events/GameEvents/KillEvent.swift
@@ -24,6 +24,9 @@ struct KillEvent: TFEvent {
         }
 
         removeSystem.handleRemove(for: entityId)
+        if player != .ownPlayer {
+            AchievementManager.incrementTotalKillCount()
+        }
 
         guard let homeSystem = target.system(ofType: HomeSystem.self) else {
             return nil
diff --git a/TowerForge/TowerForge/GameModule/Systems/GameSystems/RemoveSystem.swift b/TowerForge/TowerForge/GameModule/Systems/GameSystems/RemoveSystem.swift
index ed83ace5..420f7f4b 100644
--- a/TowerForge/TowerForge/GameModule/Systems/GameSystems/RemoveSystem.swift
+++ b/TowerForge/TowerForge/GameModule/Systems/GameSystems/RemoveSystem.swift
@@ -13,9 +13,6 @@ class RemoveSystem: TFSystem {
     /// Removes the provided entity
     /// - Parameter entityId: The UUID of the associated TFEntity to be removed
     func handleRemove(for entityId: UUID) {
-        if entityManager.entity(with: entityId)?.component(ofType: PlayerComponent.self)?.player != .ownPlayer {
-            AchievementManager.incrementTotalKillCount() // Increment if entity does not belong to own player
-        }
         entityManager.removeEntity(with: entityId)
     }
 }