diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 1020410867a..fbf2e360b85 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -1811,7 +1811,7 @@ function deleteAll($conditions, $cascade = true, $callbacks = false) {
 			);
 
 			if (empty($ids)) {
-				return false;
+				return true;
 			}
 
 			if ($callbacks) {
diff --git a/cake/tests/cases/libs/model/model.test.php b/cake/tests/cases/libs/model/model.test.php
index c8e84769f03..72e1d381c46 100644
--- a/cake/tests/cases/libs/model/model.test.php
+++ b/cake/tests/cases/libs/model/model.test.php
@@ -7487,6 +7487,9 @@ function testDeleteAll() {
 				'published' => 'Y'
 		)));
 		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
 	}
 /**
  * testRecursiveDel method