diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7dceb0..4ee4c47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,4 +6,7 @@
 
 ## 0.1.08  
 - Fixes for SWADE system
-- Fixes for polymorphing in dnd5e
\ No newline at end of file
+- Fixes for polymorphing in dnd5e
+
+## 0.1.09
+- Fixed issue with polymorphing, changing image or size outside combat
\ No newline at end of file
diff --git a/src/nextUp.js b/src/nextUp.js
index 580e61a..539a717 100644
--- a/src/nextUp.js
+++ b/src/nextUp.js
@@ -267,6 +267,7 @@ Hooks.once('ready', () => {
 
     Hooks.on("preUpdateToken", (token, update) => {
         if ("height" in update || "width" in update || "img" in update) {
+            if(!token.inCombat) return;
             let markerToken = token.object?.children.find(i => i.NUMaker)
             TweenMax.killTweensOf(token.object?.children);
             Hooks.once("updateToken", async (token, update) => {