diff --git a/mods/hudbars/init.lua b/mods/hudbars/init.lua
index ebd2ba1e..ee15f6cb 100755
--- a/mods/hudbars/init.lua
+++ b/mods/hudbars/init.lua
@@ -180,12 +180,12 @@ function hb.change_hudbar(player, identifier, new_value, new_max_value)
 	local hudtable = hb.get_hudtable(identifier)
 	local value_changed, max_changed = false, false
 
-	if new_value ~= nil then
+	if new_value ~= nil and hudtable.hudstate[name] then
 		if new_value ~= hudtable.hudstate[name].value then
 			hudtable.hudstate[name].value = new_value
 			value_changed = true
 		end
-	else
+	elseif hudtable.hudstate[name] then
 		new_value = hudtable.hudstate[name].value
 	end
 	if new_max_value ~= nil then