diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b3b8e2eca1a0160e4c53c143b161b175cc1fd872..e529993abc8fd8ad11b25b13f041864475d789b8 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -46,6 +46,7 @@ set(DOXYGEN_WARN_NO_PARAMDOC YES)
 
 find_package(PlantUML)
 if(PlantUML_FOUND)
+  set(DOXYGEN_ENABLED_SECTIONS diagrams)
   set(DOXYGEN_PLANTUML_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/diagrams)
   set(DOXYGEN_PLANTUML_JAR_PATH ${PLANTUML_JAR})
 endif()
diff --git a/include/MantleAPI/Common/i_logger.h b/include/MantleAPI/Common/i_logger.h
index b5c72f39657054d986aa63c233c7f431d2223270..58b6f68406e23c9683393a7671551a552580d50a 100644
--- a/include/MantleAPI/Common/i_logger.h
+++ b/include/MantleAPI/Common/i_logger.h
@@ -24,9 +24,11 @@ namespace mantle_api
 
 /// @defgroup logging Logging
 /// Logging related classes and utilities
+/// @if diagrams
 /// @startuml
 /// !include logging.puml!0
 /// @enduml
+/// @endif
 
 /// Log level definition for ILogger
 /// @ingroup logging