diff --git a/addons/medical/functions/fnc_displayTriageCard.sqf b/addons/medical/functions/fnc_displayTriageCard.sqf
index c25b49f7ce..1be467a5a6 100644
--- a/addons/medical/functions/fnc_displayTriageCard.sqf
+++ b/addons/medical/functions/fnc_displayTriageCard.sqf
@@ -19,7 +19,7 @@
 
 params ["_target", ["_show", true]];
 
-GVAR(TriageCardTarget) = if (_show) then {_target} else {ObjNull};
+GVAR(TriageCardTarget) = [objNull, _target] select _show;
 
 if (_show) then {
     //("ACE_MedicalTriageCard" call BIS_fnc_rscLayer) cutRsc [QGVAR(triageCard),"PLAIN"];
@@ -32,7 +32,6 @@ if (_show) then {
             [_idPFH] call CBA_fnc_removePerFrameHandler;
         };
 
-        disableSerialization;
         private _display = uiNamespace getVariable QGVAR(triageCard);
         if (isNil "_display") exitWith {
             [_idPFH] call CBA_fnc_removePerFrameHandler;
@@ -58,7 +57,7 @@ if (_show) then {
             _triageCardTexts pushBack format["%1x - %2", _amount, _message];
         } forEach _log;
 
-        if (count _triageCardTexts == 0) then {
+        if (_triageCardTexts isEqualTo []) then {
             _lbCtrl lbAdd (localize ELSTRING(medical,TriageCard_NoEntry));
         };
         {
diff --git a/addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf b/addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf
index 62ad74db19..403e8179d3 100644
--- a/addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf
+++ b/addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf
@@ -63,6 +63,9 @@ private _allUsedMedication = _target getVariable [QEGVAR(medical,allUsedMedicati
    _target setVariable [_x select 0, nil];
 } forEach _allUsedMedication;
 
+// Reset triage card since medication is all reset
+_target setVariable [QEGVAR(medical,triageCard), [], true];
+
 [_target, false] call EFUNC(medical_engine,setLimping);
 
 // Resetting damage