diff --git a/radio/src/thirdparty/libopenui/src/layer.h b/radio/src/thirdparty/libopenui/src/layer.h
index 1422dc64e..379a8a267 100644
--- a/radio/src/thirdparty/libopenui/src/layer.h
+++ b/radio/src/thirdparty/libopenui/src/layer.h
@@ -41,10 +41,13 @@ class Layer
         parentLayer.focus = Window::getFocus();
       }
       stack.emplace_back(Layer(window));
+
+#if defined(DEBUG_WINDOWS)
       TRACE_WINDOWS("New layer added for %s (%d layers)", window->getWindowDebugString().c_str(), stack.size());
       for (auto layer: stack) {
         TRACE_WINDOWS(" - %s (focus=%s)", layer.main->getWindowDebugString().c_str(), layer.focus ? layer.focus->getWindowDebugString().c_str() : "---");
       }
+#endif
     }
 
     static void pop(Window * window)
@@ -66,9 +69,11 @@ class Layer
         }
       }
 
+#if defined(DEBUG_WINDOWS)
       TRACE_WINDOWS("Layer removed for %s (%d layers)", window->getWindowDebugString().c_str(), stack.size());
       for (auto layer: stack) {
         TRACE_WINDOWS(" - %s (focus=%s)", layer.main->getWindowDebugString().c_str(), layer.focus ? layer.focus->getWindowDebugString().c_str() : "---");
       }
+#endif
     }
 };