diff --git a/ddk-configuration/pmd/ruleset.xml b/ddk-configuration/pmd/ruleset.xml
index 3c4f305fbe..0032b26e3d 100644
--- a/ddk-configuration/pmd/ruleset.xml
+++ b/ddk-configuration/pmd/ruleset.xml
@@ -75,7 +75,6 @@
     <exclude name="UnusedPrivateMethod"/><!-- false positives-->
     <exclude name="DefaultLabelNotLastInSwitch"/>
     <exclude name="ForLoopCanBeForeach"/>
-    <exclude name="GuardLogStatement"/><!--TODO-->
     <exclude name="ImplicitFunctionalInterface"/>
     <exclude name="UnitTestAssertionsShouldIncludeMessage"/>
     <exclude name="UnitTestContainsTooManyAsserts"/><!--New after PMD 5.3 upgrade, limitation to 1 assert not sensible, would need customization, disabled for the time being-->
@@ -88,6 +87,12 @@
     <exclude name="UnusedLocalVariable"/><!--Checkstyle-->
     <exclude name="JUnit5TestShouldBePackagePrivate"/>
   </rule>
+  <rule ref="category/java/bestpractices.xml/GuardLogStatement">
+    <properties>
+      <property name="logLevels" value="trace,debug" />
+      <property name="guardsMethods" value="isTraceEnabled,isDebugEnabled" />
+    </properties>
+  </rule>
   <rule ref="category/java/bestpractices.xml/UnusedFormalParameter">
     <properties>
         <property name="checkAll" value="true" />