diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/skillmod/SkillModService.java b/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/skillmod/SkillModService.java
index 7ceca987..f8819c70 100644
--- a/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/skillmod/SkillModService.java
+++ b/src/main/java/com/projectswg/holocore/services/gameplay/player/experience/skills/skillmod/SkillModService.java
@@ -213,12 +213,20 @@ public class SkillModService extends Service {
 		
 		if (newHealth != 0){
 			creature.setMaxHealth(creature.getMaxHealth() + newHealth);
-			creature.setHealth(creature.getMaxHealth());
+			
+			if (!creature.isInCombat()) {
+				// Don't replenish  health to 100% if creature is in combat
+				creature.setHealth(creature.getMaxHealth());
+			}
 		}
 		
 		if (newAction !=0){
 			creature.setMaxAction(creature.getMaxAction() + newAction);
-			creature.setAction(creature.getMaxAction());
+			
+			if (!creature.isInCombat()) {
+				// Don't replenish action to 100% if creature is in combat
+				creature.setAction(creature.getMaxAction());
+			}
 		}
 	}