diff --git a/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java
index fb2a6eb127d16465d1fc234ef411f0850cec2376..bea452f976de37d003f603287ff58f55ea504bb6 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java
@@ -54,6 +54,7 @@ public final class ServitorShare extends AbstractEffect
 		if (info.getEffected().getActingPlayer().getSummon() != null)
 		{
 			info.getEffected().getActingPlayer().getSummon().broadcastInfo();
+			info.getEffected().getActingPlayer().getSummon().getStatus().startHpMpRegeneration();
 		}
 	}
 	
@@ -75,6 +76,14 @@ public final class ServitorShare extends AbstractEffect
 		info.getEffected().getActingPlayer().setServitorShare(null);
 		if (info.getEffected().getSummon() != null)
 		{
+			if (info.getEffected().getSummon().getCurrentHp() > info.getEffected().getSummon().getMaxHp())
+			{
+				info.getEffected().getSummon().setCurrentHp(info.getEffected().getSummon().getMaxHp());
+			}
+			if (info.getEffected().getSummon().getCurrentMp() > info.getEffected().getSummon().getMaxMp())
+			{
+				info.getEffected().getSummon().setCurrentMp(info.getEffected().getSummon().getMaxMp());
+			}
 			info.getEffected().getSummon().broadcastInfo();
 		}
 	}