diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index 5df9cc879..2fd4e1a9d 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -2135,7 +2135,9 @@ drawscreen(PLAYERp pp)
         JS_DrawMirrors(pp, tx, ty, tz, tq16ang, tq16horiz);
     }
 
-    if (dimensionmode != 6 && !FAF_DebugView)
+    // TODO: This call is redundant if the tiled overhead map is shown, but the
+    // HUD elements should be properly outputted with hardware rendering first.
+    if (!FAF_DebugView)
         FAF_DrawRooms(tx, ty, tz, tq16ang, tq16horiz, tsectnum);
 
     analyzesprites(tx, ty, tz, FALSE);