diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php
index c0d68829b..8d7dd6259 100644
--- a/lib/Doctrine/ORM/Query/SqlWalker.php
+++ b/lib/Doctrine/ORM/Query/SqlWalker.php
@@ -372,16 +372,11 @@ class SqlWalker implements TreeWalker
             } else if ($lockMode == \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE) {
                 $sql .= " " . $this->_platform->getWriteLockSQL();
             } else if ($lockMode == \Doctrine\DBAL\LockMode::OPTIMISTIC) {
-                $versionedClassFound = false;
                 foreach ($this->_selectedClasses AS $class) {
-                    if ($class->isVersioned) {
-                        $versionedClassFound = true;
+                    if (!$class->isVersioned) {
+                        throw \Doctrine\ORM\OptimisticLockException::lockFailed();
                     }
                 }
-
-                if (!$versionedClassFound) {
-                    throw \Doctrine\ORM\OptimisticLockException::lockFailed();
-                }
             }
         }