diff --git a/changes.md b/changes.md
index e968a3245d..dc1108a048 100644
--- a/changes.md
+++ b/changes.md
@@ -3,8 +3,9 @@ Changes log
 
 - 2.7 Milestone 3 (??-??-2025)
   - Bugs fixed
-    - Reuse an instance of Random class in RandomUtils. Issue #1487.
-    - Complete test classes. Issue #1490.
+      - Reuse an instance of Random class in RandomUtils. Issue #1487.
+      - Complete test classes. Issue #1490.
+      - Avoid non-short-circuit logic in FileClientHelper. Issue #1495.
 
 - 2.7 Milestone 2 (29-06-2025)
     - Misc
diff --git a/org.restlet/src/main/java/org/restlet/engine/local/FileClientHelper.java b/org.restlet/src/main/java/org/restlet/engine/local/FileClientHelper.java
index 965ec5f7bc..381493d0de 100644
--- a/org.restlet/src/main/java/org/restlet/engine/local/FileClientHelper.java
+++ b/org.restlet/src/main/java/org/restlet/engine/local/FileClientHelper.java
@@ -205,7 +205,7 @@ private static boolean isFileInDirectory(final Directory directory, final File f
 			final String fileAbsolute = directory.getRootRef().getPath(true);
 			final String filePath;
 
-			if (fileAbsolute.indexOf(':') == 2 | fileAbsolute.indexOf('|') == 2) {
+			if (fileAbsolute.indexOf(':') == 2 || fileAbsolute.indexOf('|') == 2) {
 				filePath = fileAbsolute.substring(1);
 			} else {
 				filePath = fileAbsolute;