diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 33ac061450e..8eef0443467 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -24,7 +24,7 @@
           False: { state: dispover-ready, visible: true }
       enum.PowerDeviceVisuals.Powered:
         enum.DisposalUnitVisualLayers.OverlayCharging:
-          False: { visible: false } 
+          False: { visible: false }
       enum.AnchorVisuals.Anchored:
         enum.DisposalUnitVisualLayers.Base:
           True: { state: disposal }
@@ -81,7 +81,6 @@
         - MachineMask
         layer:
         - None
-  - type: PlungerUse
   - type: Appearance
   - type: SecretStash
     secretStashName: secret-stash-toilet
@@ -100,17 +99,9 @@
     interfaces:
       enum.DisposalUnitUiKey.Key:
         type: DisposalUnitBoundUserInterface
-  - type: Rummageable
-    table: !type:NestedSelector
-      tableId: RatKingLoot
   - type: SolutionManager
     solutions:
     - SolutionDrainNormal
-  - type: SolutionRegeneration
-    generated:
-      reagents:
-      - ReagentId: Water
-        Quantity: 1
   - type: DrainableSolution
     solution: tank
   - type: ReagentTank
@@ -121,6 +112,23 @@
     solution: tank
     destroyOnEmpty: false
     utensil: Spoon
+  - type: SolutionRegeneration
+    generated:
+      reagents:
+      - ReagentId: Water
+        Quantity: 1
+
+# constructed toilets don't come with Rummageable or plungeruse component to avoid infinite item spawning.
+- type: entity
+  parent: BaseToilet
+  id: ConstructedToilet
+  name: toilet
+  description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
+  suffix: Constructed, Unplungable
+  components:
+  - type: Construction
+    graph: Toilet
+    node: toilet
 
 - type: entity
   parent: BaseToilet
@@ -129,9 +137,10 @@
   description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
   suffix: Empty
   components:
-  - type: Construction
-    graph: Toilet
-    node: toilet
+  - type: PlungerUse
+  - type: Rummageable
+    table: !type:NestedSelector
+      tableId: RatKingLoot
 
 # so theres not actually any way to replenish the gastrotoxin / gold in these.
 # I wouldn't add it to the solutionregeneration comp because that doesn't make a lot of sense imo.
@@ -201,6 +210,10 @@
           IngotGold1:
             min: 5
             max: 5
+  - type: PlungerUse
+  - type: Rummageable
+    table: !type:NestedSelector
+      tableId: RatKingLoot
 
 - type: entity
   parent: ToiletGoldenEmpty
@@ -217,4 +230,4 @@
         - ReagentId: Gold
           Quantity: 20
         - ReagentId: GastroToxin
-          Quantity: 20
\ No newline at end of file
+          Quantity: 20
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
index d9a4cd02fb4..d316cc3abed 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/toilet.yml
@@ -12,7 +12,7 @@
               amount: 5
               doAfter: 1
     - node: toilet
-      entity: ToiletEmpty
+      entity: ConstructedToilet
       edges:
         - to: start
           completed: