diff --git a/src/r_bbox.c b/src/r_bbox.c
index 2812429a7..d5d2bf77c 100644
--- a/src/r_bbox.c
+++ b/src/r_bbox.c
@@ -252,6 +252,18 @@ boolean R_ThingBoundingBoxVisible(mobj_t *thing)
 {
 	INT32 cvmode = cv_renderhitbox.value;
 
+	if (thing->type == MT_WAYPOINT)
+	{
+		// Waypoints debugger serves this purpose
+		return false;
+	}
+
+	if (thing == r_viewmobj)
+	{
+		// Rendering bbox right on top causes anomalies
+		return false;
+	}
+
 	switch (cvmode)
 	{
 		case RENDERHITBOX_OFF: