diff --git a/godot/src/decentraland_components/avatar/avatar.gd b/godot/src/decentraland_components/avatar/avatar.gd
index b1618fc6..fa2f37fc 100644
--- a/godot/src/decentraland_components/avatar/avatar.gd
+++ b/godot/src/decentraland_components/avatar/avatar.gd
@@ -374,6 +374,8 @@ func apply_texture_and_mask(
 		current_material.set_shader_parameter(
 			"mask_texture", Global.content_provider.get_texture_from_hash(textures[1])
 		)
+	else:
+		current_material.set_shader_parameter("mask_texture", null)
 
 	mesh.mesh.surface_set_material(0, current_material)
 
diff --git a/godot/src/decentraland_components/avatar/wearables/wearables.gd b/godot/src/decentraland_components/avatar/wearables/wearables.gd
index b555efa9..fb89acf5 100644
--- a/godot/src/decentraland_components/avatar/wearables/wearables.gd
+++ b/godot/src/decentraland_components/avatar/wearables/wearables.gd
@@ -627,7 +627,7 @@ static func set_fallback_for_missing_needed_categories(
 			continue
 
 		# The needed category is present
-		if wearables_by_category.has(hidden_categories):
+		if wearables_by_category.has(needed_catagory):
 			continue
 
 		var fallback_wearable_id = DefaultWearables.BY_BODY_SHAPES.get(body_shape_id, {}).get(