diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/impl/visitors/CognitiveComplexityVisitor.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/impl/visitors/CognitiveComplexityVisitor.java
index 93cc0a06cc..153b5642e5 100644
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/impl/visitors/CognitiveComplexityVisitor.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/metrics/impl/visitors/CognitiveComplexityVisitor.java
@@ -23,6 +23,8 @@ public class CognitiveComplexityVisitor extends ApexParserVisitorAdapter {
         }
 
         void increaseNestingLevel() {
+            structureComplexity();
+            nestingComplexity();
             nestingLevel++;
         }
 
@@ -42,8 +44,6 @@ public class CognitiveComplexityVisitor extends ApexParserVisitorAdapter {
                 break;
             }
 
-            state.structureComplexity();
-            state.nestingComplexity();
             state.increaseNestingLevel();
             super.visit(child, data);
             state.decreaseNestingLevel();
@@ -56,8 +56,6 @@ public class CognitiveComplexityVisitor extends ApexParserVisitorAdapter {
     public Object visit(ASTForLoopStatement node, Object data) {
         State state = (State) data;
 
-        state.structureComplexity();
-        state.nestingComplexity();
         state.increaseNestingLevel();
         super.visit(node, data);
         state.decreaseNestingLevel();