diff --git a/Content.Server/PDA/PDASystem.cs b/Content.Server/PDA/PDASystem.cs
index c4af51f1c2..e7cdd33ff4 100644
--- a/Content.Server/PDA/PDASystem.cs
+++ b/Content.Server/PDA/PDASystem.cs
@@ -8,14 +8,9 @@ using Content.Server.Traitor.Uplink.Components;
 using Content.Server.PDA.Ringer;
 using Content.Server.UserInterface;
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Instruments;
-using Content.Shared.Interaction;
 using Content.Shared.PDA;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Content.Shared.Interaction.Events;
 
 namespace Content.Server.PDA
 {
@@ -31,7 +26,6 @@ namespace Content.Server.PDA
         {
             base.Initialize();
 
-            SubscribeLocalEvent<PDAComponent, ActivateInWorldEvent>(OnActivateInWorld);
             SubscribeLocalEvent<PDAComponent, LightToggleEvent>(OnLightToggle);
         }
 
@@ -44,20 +38,6 @@ namespace Content.Server.PDA
                 ui.OnReceiveMessage += (msg) => OnUIMessage(pda, msg);
         }
 
-        private void OnUse(EntityUid uid, PDAComponent pda, UseInHandEvent args)
-        {
-            if (args.Handled)
-                return;
-            args.Handled = OpenUI(pda, args.User);
-        }
-
-        private void OnActivateInWorld(EntityUid uid, PDAComponent pda, ActivateInWorldEvent args)
-        {
-            if (args.Handled)
-                return;
-            args.Handled = OpenUI(pda, args.User);
-        }
-
         protected override void OnItemInserted(EntityUid uid, PDAComponent pda, EntInsertedIntoContainerMessage args)
         {
             base.OnItemInserted(uid, pda, args);
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index e5935a8ffc..8c55c4153e 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -24,6 +24,7 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
+        prob: 0.6
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetMedical
      # - id: ClothingEyesHudMedical #Removed until working properly
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
index 498880ee6e..3669599d2c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -4,7 +4,7 @@
   animationDuration: 1.8
   spriteName: medical
   startingInventory:
-    HandheldHealthAnalyzer: 4
+    HandheldHealthAnalyzer: 3
     Brutepack: 5
     Ointment: 5
     EpinephrineChemistryBottle: 3
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 178fea5f52..9b0fe897d1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -35,6 +35,8 @@
     mask: /Textures/Effects/LightMasks/cone.png
     autoRot: true
   - type: Ringer
+  - type: ActivatableUI
+    key: enum.PDAUiKey.Key
   - type: UserInterface
     interfaces:
     - key: enum.PDAUiKey.Key
@@ -45,6 +47,8 @@
       type: RingerBoundUserInterface
     - key: enum.InstrumentUiKey.Key
       type: InstrumentBoundUserInterface
+    - key: enum.HealthAnalyzerUiKey.Key
+      type: HealthAnalyzerBoundUserInterface
   - type: PDA
     penSlot:
       startingItem: Pen
@@ -355,7 +359,7 @@
   parent: BasePDA
   id: CMOPDA
   name: chief medical officer PDA
-  description: Extraordinarily shiny and sterile.
+  description: Extraordinarily shiny and sterile. Has a built-in health analyzer.
   components:
   - type: PDA
     id: CMOIDCard
@@ -365,12 +369,14 @@
         state: pda-cmo
   - type: Icon
     state: pda-cmo
+  - type: HealthAnalyzer
+    scanDelay: 1
 
 - type: entity
   parent: BasePDA
   id: MedicalPDA
   name: medical PDA
-  description: Shiny and sterile.
+  description: Shiny and sterile. Has a built-in health analyzer.
   components:
   - type: PDA
     id: MedicalIDCard
@@ -380,6 +386,8 @@
         state: pda-medical
   - type: Icon
     state: pda-medical
+  - type: HealthAnalyzer
+    scanDelay: 1.2
 
 - type: entity
   parent: BasePDA