diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
index 030053eb9b..aa308fb31a 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -6,13 +6,14 @@
   components:
   - type: StorageFill
     contents:
+      - id: HandheldHealthAnalyzer
+        amount: 1
       - id: Brutepack
         amount: 2
       - id: Gauze
         amount: 1
       - id: Ointment
         amount: 2
-      # todo 1 Health Analyzer once it exists. Remove brutepack and ointment for suture, gauze, mesh and medipen?
       # see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
 
 - type: entity
@@ -92,6 +93,8 @@
   components:
   - type: StorageFill
     contents:
+      - id: HandheldHealthAnalyzer
+        amount: 1
       - id: Brutepack
         amount: 3 # TO DO: Advanced fills
       - id: SyringeTranexamicAcid
@@ -108,6 +111,8 @@
   components:
   - type: StorageFill
     contents:
+      - id: HandheldHealthAnalyzer
+        amount: 1
       - id: SyringeEphedrine
         amount: 1 # TO DO: More combat meds
       - id: SyringeTranexamicAcid
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
index bc4cf3eb1c..4ae1d15fa0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
@@ -9,9 +9,9 @@
     netsync: false
     state: firstaid
   - type: Storage
-    capacity: 26
+    capacity: 30
   - type: Item
-    size: 26
+    size: 30
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     HeldPrefix: firstaid