diff --git a/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java b/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
index 31a5d5b6..655e51d4 100644
--- a/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
+++ b/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
@@ -72,7 +72,7 @@ public FtpLoggingFilter(String name) {
     public void messageReceived(NextFilter nextFilter, IoSession session, Object message) throws Exception {
         String request = (String) message;
 
-        if (maskPassword && (request.trim().toUpperCase().startsWith("PASS "))) {
+        if ((request.trim().toUpperCase().startsWith("PASS ")) && maskPassword) {
             logger.info("RECEIVED: PASS *****");
         } else {
             logger.info("RECEIVED: {}", request);