diff --git a/src/k_hud.c b/src/k_hud.c
index e8935aa74..dda443852 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -5435,7 +5435,7 @@ void K_drawKartHUD(void)
 				K_drawKartPlayerCheck();
 
 		// nametags
-		if (LUA_HudEnabled(hud_names))
+		if (LUA_HudEnabled(hud_names) && cv_drawpickups.value)
 			K_drawKartNameTags();
 
 		// Draw WANTED status
diff --git a/src/r_things.c b/src/r_things.c
index 84e3ef064..e597b9b77 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -3720,6 +3720,7 @@ boolean R_ThingVisible (mobj_t *thing)
 			case MT_OVERLAY: // mostly capsule numbers :)))
 			case MT_BATTLECAPSULE:
 			case MT_BATTLECAPSULE_PIECE:
+			case MT_SPRAYCAN:
 				return false;
 
 			default: