diff --git a/framework/db/Query.php b/framework/db/Query.php
index 1819c9c3107..a614ab58148 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -280,6 +280,8 @@ public function populate($rows)
      */
     public function one($db = null)
     {
+        $this->limit(1);
+
         if ($this->emulateExecution) {
             return false;
         }