diff --git a/addons/dogtags/functions/fnc_addDogtagItem.sqf b/addons/dogtags/functions/fnc_addDogtagItem.sqf
index 970bb1926e..803c54d82f 100644
--- a/addons/dogtags/functions/fnc_addDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_addDogtagItem.sqf
@@ -20,7 +20,8 @@ params ["_item", "_dogtagData"];
 
 if (_item == "") exitWith {};
 
-[ace_player, _item] call CBA_fnc_addItem;
+// Verify that the unit has inventory space, otherwise drop the dogtag on the ground
+[ace_player, _item, true] call CBA_fnc_addItem;
 
 _dogtagData params ["_nickName"];
 private _displayText = format [localize LSTRING(takeDogtagSuccess), _nickName];
diff --git a/addons/dogtags/functions/fnc_canTakeDogtag.sqf b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
index c482d74c1c..815aeb7a79 100644
--- a/addons/dogtags/functions/fnc_canTakeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) exitWith {false};
 // check if disabled for faction
 if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
 
-(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}
+((!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}) && {_player canAdd ["ACE_dogtag", 1/*, true*/]} // Todo: Uncomment in 2.18