diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 575bffe53..580b2e72b 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -14,7 +14,9 @@ void Painter::renderTileDebug(const Tile& tile) {
     assert(tile.data);
     if (data.getDebug() != MapDebugOptions::NoDebug) {
         prepareTile(tile);
-        renderDebugText(*tile.data, tile.matrix);
+        if (data.getDebug() & (MapDebugOptions::Timestamps | MapDebugOptions::ParseStatus)) {
+            renderDebugText(*tile.data, tile.matrix);
+        }
         if (data.getDebug() & MapDebugOptions::TileBorders) {
             renderDebugFrame(tile.matrix);
         }