diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
index 0368c599ac..0225761b29 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
@@ -13,9 +13,14 @@
       Steel: 50
   - type: SpaceGarbage
   - type: Storage
-    capacity: 6
+    capacity: 5
+    whitelist:
+      tags:
+      - Cigarette
+      - Cigar
+      - Matchstick
   - type: Item
-    size: 6
+    size: 5
   - type: StorageFill
     contents:
     - id: Cigarette
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index d7ece96c7d..e4030856a1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -71,6 +71,14 @@
   - type: Item
     sprite: Objects/Tools/matches.rsi
     heldPrefix: matchbox
+    size: 5
+  - type: Storage
+    capacity: 5
+    whitelist:
+      tags:
+      - Matchstick
+      - Cigarette
+      - Cigar
     size: 10
   - type: StorageFill
     contents: