diff --git a/src/Schema/Table/Table.php b/src/Schema/Table/Table.php
index <HASH>..<HASH> 100644
--- a/src/Schema/Table/Table.php
+++ b/src/Schema/Table/Table.php
@@ -253,12 +253,12 @@
 				->from($this->table)
 				->fields(array($this->table . '.*'));
 
-			if (!is_null($inputQuery)) {
+			$query->setEntity($this->entityRule);
+
+			if (! is_null($inputQuery)) {
 				$query->composeWith($inputQuery);
 			}
 
-			$query->setEntity($this->entityRule);
-
 			return $query->execute();
 		}
Allow override entity in table objects