diff --git a/Glamourer/Designs/FixedDesigns.cs b/Glamourer/Designs/FixedDesigns.cs
index 9bcd849..2c56197 100644
--- a/Glamourer/Designs/FixedDesigns.cs
+++ b/Glamourer/Designs/FixedDesigns.cs
@@ -6,6 +6,7 @@ using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Logging;
 using Glamourer.FileSystem;
 using Penumbra.GameData.Enums;
+using Penumbra.PlayerWatch;
 
 namespace Glamourer.Designs
 {
@@ -57,9 +58,15 @@ namespace Glamourer.Designs
             }
 
             design.Enabled = true;
-            if (Dalamud.Objects.FirstOrDefault(o => o.ObjectKind == ObjectKind.Player && o.Name.ToString() == design.Name)
-                is Character character)
-                OnPlayerChange(character);
+            if (Glamourer.Config.ApplyFixedDesigns)
+            {
+                var character =
+                    CharacterFactory.Convert(Dalamud.Objects.FirstOrDefault(o
+                        => o.ObjectKind == ObjectKind.Player && o.Name.ToString() == design.Name));
+                if (character != null)
+                    OnPlayerChange(character);
+            }
+
             return changes;
         }
 
diff --git a/Glamourer/Glamourer.cs b/Glamourer/Glamourer.cs
index c411068..2e5faea 100644
--- a/Glamourer/Glamourer.cs
+++ b/Glamourer/Glamourer.cs
@@ -41,10 +41,10 @@ namespace Glamourer
             Designs       = new DesignManager();
             Penumbra      = new PenumbraAttach(Config.AttachToPenumbra);
             PlayerWatcher = PlayerWatchFactory.Create(Dalamud.Framework, Dalamud.ClientState, Dalamud.Objects);
-            FixedDesigns  = new FixedDesigns(Designs);
+            if (!Config.ApplyFixedDesigns)
+                PlayerWatcher.Disable();
 
-            if (Config.ApplyFixedDesigns)
-                PlayerWatcher.Enable();
+            FixedDesigns  = new FixedDesigns(Designs);
 
             Dalamud.Commands.AddHandler("/glamourer", new CommandInfo(OnGlamourer)
             {