diff --git a/Data/Scripts/013_Items/001_Item_Utilities.rb b/Data/Scripts/013_Items/001_Item_Utilities.rb
index ad40f5a62..7e0b9ad1f 100644
--- a/Data/Scripts/013_Items/001_Item_Utilities.rb
+++ b/Data/Scripts/013_Items/001_Item_Utilities.rb
@@ -147,6 +147,7 @@ def pbChangeLevel(pkmn, new_level, scene)
   old_speed           = pkmn.speed
   pkmn.level = new_level
   pkmn.calc_stats
+  pkmn.hp = 1 if new_level > old_level && pkmn.species_data.base_stats[:HP] == 1
   scene.pbRefresh
   if old_level > new_level
     if scene.is_a?(PokemonPartyScreen)
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
index 3481179e0..96fe239dc 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb	
@@ -597,7 +597,9 @@ class PokemonEvolutionScene
     # Check for consumed item and check if Pokémon should be duplicated
     pbEvolutionMethodAfterEvolution
     # Modify Pokémon to make it evolved
+    was_fainted = @pokemon.fainted?
     @pokemon.species = @newspecies
+    @pokemon.hp = 0 if was_fainted
     @pokemon.calc_stats
     @pokemon.ready_to_evolve = false
     # See and own evolved species