diff --git a/addons/refuel/functions/fnc_makeSource.sqf b/addons/refuel/functions/fnc_makeSource.sqf
index 30c4722377f..9d76635849f 100644
--- a/addons/refuel/functions/fnc_makeSource.sqf
+++ b/addons/refuel/functions/fnc_makeSource.sqf
@@ -40,9 +40,24 @@ TRACE_4("makeSource",_source,_fuelCargo,_hooks,_fuelCargoConfig);
 if (
     isNull _source
     || {_fuelCargo < 0 && {!(_fuelCargo in [REFUEL_INFINITE_FUEL, REFUEL_DISABLED_FUEL])}}
-    || {_fuelCargo == REFUEL_DISABLED_FUEL && {_fuelCargoConfig == REFUEL_DISABLED_FUEL}}
 ) exitWith {};
 
+// We might be removing fuel from an object that in config doesn't have fuel, but was given fuel via this function prior
+if (_fuelCargo == REFUEL_DISABLED_FUEL && {_fuelCargoConfig == REFUEL_DISABLED_FUEL}) exitWith {
+    if (isNil {_source getVariable QGVAR(currentFuelCargo)}) exitWith {};
+
+    _source setVariable [QGVAR(currentFuelCargo), nil, true];
+    _source setVariable [QGVAR(capacity), REFUEL_DISABLED_FUEL, true];
+
+    private _jipID = _source getVariable QGVAR(initSource_jipID);
+
+    if (isNil "_jipID") exitWith {};
+
+    _jipID call CBA_fnc_removeGlobalEventJIP;
+
+    _source setVariable [QGVAR(initSource_jipID), nil];
+};
+
 private _capacity = if (_fuelCargo < 0) then {_fuelCargo} else {_fuelCargoConfig max _fuelCargo};
 
 _source setVariable [QGVAR(capacity), _capacity, true];