diff --git a/addons/circulation/functions/fnc_checkCapillaryRefillLocal.sqf b/addons/circulation/functions/fnc_checkCapillaryRefillLocal.sqf
index b89383e..e2d5973 100644
--- a/addons/circulation/functions/fnc_checkCapillaryRefillLocal.sqf
+++ b/addons/circulation/functions/fnc_checkCapillaryRefillLocal.sqf
@@ -25,7 +25,7 @@ private _CRT = 4;
 private _bloodVolume = GET_BLOOD_VOLUME(_patient);
 private _bodyPartString = [ACELSTRING(medical_gui,Torso),ACELSTRING(medical_gui,LeftArm),ACELSTRING(medical_gui,RightArm)] select (_partIndex - 1);
 
-if !(IN_CRDC_ARRST(_patient)) then {
+if (HAS_PULSE(_patient)) then {
     if (_partIndex in [2,3]) then {
         if !(HAS_TOURNIQUET_APPLIED_ON(_patient,_partIndex)) then {
             _CRT = linearConversion [5.8, 5.2, _bloodVolume, 2, 4];
diff --git a/addons/circulation/functions/fnc_getEKGHeartRate.sqf b/addons/circulation/functions/fnc_getEKGHeartRate.sqf
index f1dfffe..1448927 100644
--- a/addons/circulation/functions/fnc_getEKGHeartRate.sqf
+++ b/addons/circulation/functions/fnc_getEKGHeartRate.sqf
@@ -80,7 +80,7 @@ if (alive (_patient getVariable [QACEGVAR(medical,CPR_provider), objNull])) exit
 
 private _rhythm = _patient getVariable [QGVAR(Cardiac_RhythmState), ACM_Rhythm_Sinus];
 
-if (!(HAS_PULSE(_patient)) && _rhythm != ACM_Rhythm_PEA) exitWith {0};
+if ([_patient] call FUNC(recentAEDShock) || !(alive _patient)) exitWith {0};
 
 switch (_rhythm) do {
     case ACM_Rhythm_Asystole: { // Asystole