diff --git a/addons/medical/functions/fnc_handleTreatment.sqf b/addons/medical/functions/fnc_handleTreatment.sqf
index ec91260615..9ccded11d1 100644
--- a/addons/medical/functions/fnc_handleTreatment.sqf
+++ b/addons/medical/functions/fnc_handleTreatment.sqf
@@ -35,9 +35,14 @@ if ([_caller] call FUNC(isSetTreatmentMutex)) exitwith {
 [_caller, true] call FUNC(treatmentMutex);
 
 if (!([_caller, _target, _removeItem] call FUNC(hasEquipment)) && _removeItem != "") exitwith {
-    [_caller,"release"] call FUNC(treatmentMutex);
+    [_caller, false] call FUNC(treatmentMutex);
 };
 
+if (primaryWeapon _caller == "") then {
+    _caller addWeapon "ACE_FakePrimaryWeapon";
+};
+_caller selectWeapon (primaryWeapon _unit);
+
 // TODO make dynamic
 switch (toLower _category) do {
     case "bandage": {
@@ -53,7 +58,7 @@ switch (toLower _category) do {
         ([_caller, _target, _selectionName, _removeItem] call FUNC(handleTreatment_Category_Airway));
     };
     default {
-        // do not handle the request
+        // Do not handle the request
         false;
     };
 };
@@ -66,4 +71,4 @@ if ([_target] call FUNC(hasMedicalEnabled)) then {
     [_target] call FUNC(addToInjuredCollection);
 };
 
-true;
\ No newline at end of file
+true;