diff --git a/Source/Nakatomi/HealthComponent.cpp b/Source/Nakatomi/HealthComponent.cpp
index 0f6f24d..3f50739 100644
--- a/Source/Nakatomi/HealthComponent.cpp
+++ b/Source/Nakatomi/HealthComponent.cpp
@@ -57,8 +57,12 @@ float UHealthComponent::GetCurrentHealth()
 
 void UHealthComponent::SetCurrentHealth(float value)
 {
-	// TODO: We might want to add some extra checking here
 	CurrentHealth = value;
+
+	if (CurrentHealth > MaxHealth)
+	{
+		CurrentHealth = MaxHealth;
+	}
 }
 
 void UHealthComponent::ResetHealth()