diff --git a/src/k_hud.c b/src/k_hud.c
index 86d36051c..942405640 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -3274,10 +3274,7 @@ static void K_drawKartNameTags(void)
 		}
 	}
 
-	if (battlecapsules == true)
-	{
-		K_drawTargetHUD(&c, stplyr);
-	}
+	K_drawTargetHUD(&c, stplyr);
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp
index c4063cccf..8a04dd7ae 100644
--- a/src/k_hud_track.cpp
+++ b/src/k_hud_track.cpp
@@ -206,6 +206,19 @@ void K_DrawTargetTracking(const TargetTracking& target)
 	}
 }
 
+bool is_object_tracking_target(const mobj_t* mobj)
+{
+	switch (mobj->type)
+	{
+	case MT_BATTLECAPSULE:
+	case MT_SPECIAL_UFO:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
 }; // namespace
 
 void K_drawTargetHUD(const vector3_t* origin, player_t* player)
@@ -224,7 +237,7 @@ void K_drawTargetHUD(const vector3_t* origin, player_t* player)
 			continue;
 		}
 
-		if (mobj->type != MT_BATTLECAPSULE)
+		if (is_object_tracking_target(mobj) == false)
 		{
 			continue;
 		}
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 707f10a17..67c4e95d6 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -5247,6 +5247,7 @@ static boolean P_IsTrackerType(INT32 type)
 		// Primarily for minimap data, handle with care
 		case MT_SPB:
 		case MT_BATTLECAPSULE:
+		case MT_SPECIAL_UFO:
 			return true;
 
 		default: