diff --git a/package-lock.json b/package-lock.json
index d0fe35a..29be18d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@athenna/database",
-  "version": "5.39.0",
+  "version": "5.40.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@athenna/database",
-      "version": "5.39.0",
+      "version": "5.40.0",
       "license": "MIT",
       "dependencies": {
         "@faker-js/faker": "^8.4.1"
diff --git a/package.json b/package.json
index 993a096..b333838 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@athenna/database",
-  "version": "5.39.0",
+  "version": "5.40.0",
   "description": "The Athenna database handler for SQL/NoSQL.",
   "license": "MIT",
   "author": "João Lenon <lenon@athenna.io>",
diff --git a/src/database/builders/QueryBuilder.ts b/src/database/builders/QueryBuilder.ts
index d592295..e797cd1 100644
--- a/src/database/builders/QueryBuilder.ts
+++ b/src/database/builders/QueryBuilder.ts
@@ -252,7 +252,7 @@ export class QueryBuilder<
   /**
    * Create data or update if already exists.
    */
-  public async createOrUpdate(data?: Partial<T>): Promise<T | T[]> {
+  public async createOrUpdate(data?: Partial<T>): Promise<T> {
     return this.driver.createOrUpdate(data)
   }
 
diff --git a/src/models/BaseModel.ts b/src/models/BaseModel.ts
index e64a3ef..391d133 100644
--- a/src/models/BaseModel.ts
+++ b/src/models/BaseModel.ts
@@ -426,7 +426,7 @@ export class BaseModel {
     where: Partial<InstanceType<T>>,
     data: Partial<InstanceType<T>>,
     cleanPersist = true
-  ): Promise<InstanceType<T> | InstanceType<T>[]> {
+  ): Promise<InstanceType<T>> {
     const query = this.query()
 
     if (where) {
diff --git a/src/models/builders/ModelQueryBuilder.ts b/src/models/builders/ModelQueryBuilder.ts
index f58d456..a28ba86 100644
--- a/src/models/builders/ModelQueryBuilder.ts
+++ b/src/models/builders/ModelQueryBuilder.ts
@@ -390,7 +390,7 @@ export class ModelQueryBuilder<
     if (hasValue) {
       const pk = this.primaryKeyProperty
 
-      return this.where(pk, hasValue[pk as any]).update(data, cleanPersist)
+      return this.where(pk, hasValue[pk as any]).update(data, cleanPersist) as Promise<M>
     }
 
     return this.create(data, cleanPersist)