diff --git a/lib/Table.php b/lib/Table.php
index 62ba2814..f363621f 100644
--- a/lib/Table.php
+++ b/lib/Table.php
@@ -316,10 +316,9 @@ public function find_by_sql(string $sql, array $values = [], bool $readonly = fa
 
             if ($collect_attrs_for_includes) {
                 $attrs[] = $model->attributes();
+                $list[] = $model;
             }
 
-            $list[] = $model;
-
             yield $model;
         }