diff --git a/src/kernel/equipment.c b/src/kernel/equipment.c
index b94b0c307..9ea176385 100644
--- a/src/kernel/equipment.c
+++ b/src/kernel/equipment.c
@@ -139,6 +139,7 @@ void equip_unit_mask(struct unit *u, const struct equipment *eq, int mask)
             set_level(u, (skill_t)sk, i);
         }
       }
+	  u->hp = unit_max_hp(u) * u->number;    // Bring the unit to max HitPoints just for the case stamina was changed
     }
 
     if (mask & EQUIP_SPELLS) {
diff --git a/src/spells/spells.c b/src/spells/spells.c
index 605119f19..33e8c527a 100644
--- a/src/spells/spells.c
+++ b/src/spells/spells.c
@@ -3235,6 +3235,7 @@ static void skill_summoned(unit * u, int level)
       }
     }
   }
+  u->hp = unit_max_hp(u) * u->number;    // Bring the unit to max HitPoints just for the case stamina was changed
 }
 
 /* ------------------------------------------------------------- */