From b7397b93e4d04c7705e1d13e10cd7dcd015a3770 Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Sun, 21 Dec 2025 13:46:19 +0100
Subject: [PATCH] .

---
 module/data/item/beastform.mjs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/data/item/beastform.mjs b/module/data/item/beastform.mjs
index 532cfcec..669cd4b1 100644
--- a/module/data/item/beastform.mjs
+++ b/module/data/item/beastform.mjs
@@ -196,14 +196,14 @@ export default class DHBeastform extends BaseDataItem {
 
         await this.parent.parent.createEmbeddedDocuments('ActiveEffect', [beastformEffect.toObject()]);
 
-        let width = this.tokenSize.width;
-        let height = this.tokenSize.height;
-        if (this.tokenSize.size !== 'custom') {
-            const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
-            const tokenSize = tokenSizes[this.tokenSize.size];
-            width = tokenSize;
-            height = tokenSize;
-        }
+        const autoTokenSize =
+            this.tokenSize.size !== 'custom'
+                ? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes[
+                      this.tokenSize.size
+                  ]
+                : null;
+        const width = autoTokenSize ?? this.tokenSize.width;
+        const height = autoTokenSize ?? this.tokenSize.height;
 
         const prototypeTokenUpdate = {
             height,