diff --git a/package-lock.json b/package-lock.json
index 29be18d..245a6bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@athenna/database",
-  "version": "5.40.0",
+  "version": "5.41.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@athenna/database",
-      "version": "5.40.0",
+      "version": "5.41.0",
       "license": "MIT",
       "dependencies": {
         "@faker-js/faker": "^8.4.1"
diff --git a/package.json b/package.json
index b333838..4bee1ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/database",
-  "version": "5.40.0",
+  "version": "5.41.0",
   "description": "The Athenna database handler for SQL/NoSQL.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
diff --git a/src/models/builders/ModelQueryBuilder.ts b/src/models/builders/ModelQueryBuilder.ts
index e430514..4e3cbea 100644
--- a/src/models/builders/ModelQueryBuilder.ts
+++ b/src/models/builders/ModelQueryBuilder.ts
@@ -832,7 +832,7 @@ export class ModelQueryBuilder<
       return this
     }
 
-    if (!operation) {
+    if (!Is.String(statement) && Is.Undefined(operation)) {
       const parsed = this.schema.propertiesToColumnNames(statement)
 
       super.where(parsed)
@@ -871,7 +871,7 @@ export class ModelQueryBuilder<
       return this
     }
 
-    if (!value) {
+    if (!Is.String(statement) && Is.Undefined(value)) {
       const parsed = this.schema.propertiesToColumnNames(statement)
 
       super.whereNot(parsed)
@@ -1017,7 +1017,7 @@ export class ModelQueryBuilder<
       return this
     }
 
-    if (!operation) {
+    if (!Is.String(statement) && Is.Undefined(operation)) {
       const parsed = this.schema.propertiesToColumnNames(statement)
 
       super.orWhere(parsed)
@@ -1056,7 +1056,7 @@ export class ModelQueryBuilder<
       return this
     }
 
-    if (!value) {
+    if (!Is.String(statement) && Is.Undefined(value)) {
       const parsed = this.schema.propertiesToColumnNames(statement)
 
       super.orWhereNot(parsed)
@@ -1079,7 +1079,7 @@ export class ModelQueryBuilder<
    * Set a orWhere like statement in your query.
    */
   public orWhereLike(statement: any, value?: any) {
-    if (!value) {
+    if (!Is.String(statement) && Is.Undefined(value)) {
       const parsed = this.schema.propertiesToColumnNames(statement)
 
       super.orWhereLike(parsed)
@@ -1102,7 +1102,7 @@ export class ModelQueryBuilder<
    * Set a orWhere ILike statement in your query.
    */
   public orWhereILike(statement: any, value?: any) {
-    if (!value) {
+    if (!Is.String(statement) && Is.Undefined(value)) {
       const parsed = this.schema.propertiesToColumnNames(statement)
 
       super.orWhereILike(parsed)