diff --git a/src/db/ModelQuery.ts b/src/db/ModelQuery.ts
index 734c577..13c7452 100644
--- a/src/db/ModelQuery.ts
+++ b/src/db/ModelQuery.ts
@@ -272,7 +272,9 @@ class FieldValue {
     }
 
     public get variables(): any[] {
-        return this.value instanceof ModelQuery ? this.value.variables : [this.value];
+        if (this.value instanceof ModelQuery) return this.value.variables;
+        if (this.raw || this.value === null) return [];
+        return [this.value];
     }
 }