diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
index 0fb4a41a52..0b1cd53b4e 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/JavaCCTokenFilter.java
@@ -31,12 +31,11 @@ public class JavaCCTokenFilter implements TokenFilter {
             analyzeToken(currentToken);
             processCPDSuppression(currentToken);
 
-            if (isDiscarding()) {
-                currentToken = (GenericToken) tokenManager.getNextToken();
-                continue;
+            if (!isDiscarding()) {
+                return currentToken;
             }
 
-            return currentToken;
+            currentToken = (GenericToken) tokenManager.getNextToken();
         }
         
         return null;