diff --git a/addons/reload/functions/fnc_canCheckAmmo.sqf b/addons/reload/functions/fnc_canCheckAmmo.sqf
index 2cabe6edc2..63c302bf07 100644
--- a/addons/reload/functions/fnc_canCheckAmmo.sqf
+++ b/addons/reload/functions/fnc_canCheckAmmo.sqf
@@ -15,7 +15,17 @@ EXPLODE_2_PVT(_this,_player,_target);
 
 // Return true for static weapons if they have been fired once, @todo 1.40 this work-around doesn't work anymore
 if (_target isKindOf "StaticWeapon") exitWith {
-	(currentMagazine _target) != ""
+    if (currentMagazine _target != "") exitWith {true};
+
+    private ["_magazines","_found"];
+    _magazines = magazinesAmmoFull _target;
+    _found = false;
+    {
+        if (_x select 2) exitWith {
+            _found = true;
+        };
+    } forEach _magazines;
+    _found
 };
 
 // Return false for all other vehicles
diff --git a/addons/reload/functions/fnc_displayAmmo.sqf b/addons/reload/functions/fnc_displayAmmo.sqf
index 07e1a4593a..0f814853ac 100644
--- a/addons/reload/functions/fnc_displayAmmo.sqf
+++ b/addons/reload/functions/fnc_displayAmmo.sqf
@@ -28,8 +28,20 @@ if (_target isKindOf "StaticWeapon") then {
       _muzzle = _weapon;
     };
   };
+
+  if (_magazine == "") then {
+    // Try to get magazine using magazinesAmmoFull
+    private ["_magazines"];
+    _magazines = magazinesAmmoFull _target;
+    {
+        if (_x select 2) exitWith {
+            _magazine = _x select 0;
+        };
+    } forEach _magazines;
+  };
 };
 
+if (_magazine == "") exitWith {};
 if (_weapon == "") exitWith {};
 if (typeName _muzzle != "STRING") then {_muzzle = _weapon};