diff --git a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
deleted file mode 100644
index 77d54159c1..0000000000
--- a/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Robust.Client.GameObjects;
-using Content.Shared.Kitchen;
-
-namespace Content.Client.Kitchen.Visualizers
-{
-    public sealed class ReagentGrinderVisualizer : AppearanceVisualizer
-    {
-        [Obsolete("Subscribe to AppearanceChangeEvent instead.")]
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-            var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(component.Owner);
-            component.TryGetData(ReagentGrinderVisualState.BeakerAttached, out bool hasBeaker);
-            sprite.LayerSetState(0, $"juicer{(hasBeaker ? "1" : "0")}");
-        }
-    }
-}
diff --git a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
index 9859d83a3e..68f8c21b19 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -15,8 +15,12 @@
     - key: enum.ReagentGrinderUiKey.Key
       type: ReagentGrinderBoundUserInterface
   - type: Appearance
+  - type: GenericVisualizer
     visuals:
-    - type: ReagentGrinderVisualizer
+      enum.ReagentGrinderVisualState.BeakerAttached:
+        grinder:
+          True: {state: "juicer1"}
+          False: {state: "juicer0"}
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -30,9 +34,11 @@
   - type: Sprite
     netsync: false
     sprite: Structures/Machines/juicer.rsi
-    state: juicer0
     drawdepth: SmallObjects
     snapCardinals: true
+    layers:
+    - map: [ "grinder" ]
+      state: "juicer0"
   - type: ApcPowerReceiver
     powerLoad: 300
   - type: UpgradePowerDraw