diff --git a/packages/fabric/domain/src/errors/query-error.ts b/packages/fabric/domain/src/errors/query-error.ts
index fca7f63..ca36ae8 100644
--- a/packages/fabric/domain/src/errors/query-error.ts
+++ b/packages/fabric/domain/src/errors/query-error.ts
@@ -1,12 +1,7 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { TaggedError } from "@fabric/core";
 
 export class StoreQueryError extends TaggedError<"StoreQueryError"> {
-  constructor(
-    public message: string,
-    public context: any,
-  ) {
-    super("StoreQueryError");
+  constructor(public message: string) {
+    super("StoreQueryError", message);
   }
 }
diff --git a/packages/fabric/sqlite-store/src/events/event-store.ts b/packages/fabric/sqlite-store/src/events/event-store.ts
index 298a38d..b54e659 100644
--- a/packages/fabric/sqlite-store/src/events/event-store.ts
+++ b/packages/fabric/sqlite-store/src/events/event-store.ts
@@ -49,7 +49,7 @@ export class SQLiteEventStore<TEvents extends Event>
             )`,
         );
       },
-      (error) => new StoreQueryError(error.message, { error }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -74,7 +74,7 @@ export class SQLiteEventStore<TEvents extends Event>
         );
         return events;
       },
-      (error) => new StoreQueryError(error.message, { error }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -120,10 +120,7 @@ export class SQLiteEventStore<TEvents extends Event>
 
         return !lastVersion ? 0n : BigInt(lastVersion);
       },
-      (error) =>
-        new StoreQueryError(`Error getting last version:${error.message}`, {
-          error,
-        }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -146,7 +143,7 @@ export class SQLiteEventStore<TEvents extends Event>
   close(): AsyncResult<void, StoreQueryError> {
     return AsyncResult.tryFrom(
       () => this.db.close(),
-      (error) => new StoreQueryError(error.message, { error }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -176,7 +173,7 @@ export class SQLiteEventStore<TEvents extends Event>
         );
         return storedEvent;
       },
-      (error) => new StoreQueryError("Error appending event", { error }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 }
diff --git a/packages/fabric/sqlite-store/src/state/query-builder.ts b/packages/fabric/sqlite-store/src/state/query-builder.ts
index ef29134..858f725 100644
--- a/packages/fabric/sqlite-store/src/state/query-builder.ts
+++ b/packages/fabric/sqlite-store/src/state/query-builder.ts
@@ -62,11 +62,7 @@ export class QueryBuilder<T> implements StoreQuery<T> {
           transformRow(this.schema[this.query.from]),
         );
       },
-      (err) =>
-        new StoreQueryError(err.message, {
-          err,
-          query: this.query,
-        }),
+      (err) => new StoreQueryError(err.message),
     );
   }
 
@@ -91,11 +87,7 @@ export class QueryBuilder<T> implements StoreQuery<T> {
           transformRow(this.schema[this.query.from]),
         );
       },
-      (err) =>
-        new StoreQueryError(err.message, {
-          err,
-          query: this.query,
-        }),
+      (err) => new StoreQueryError(err.message),
     );
   }
 }
diff --git a/packages/fabric/sqlite-store/src/state/state-store.ts b/packages/fabric/sqlite-store/src/state/state-store.ts
index 2c097c1..ccb02cc 100644
--- a/packages/fabric/sqlite-store/src/state/state-store.ts
+++ b/packages/fabric/sqlite-store/src/state/state-store.ts
@@ -52,12 +52,7 @@ export class SQLiteStateStore<TModel extends Model>
           recordToSQLParams(model, record),
         );
       },
-      (error) =>
-        new StoreQueryError(error.message, {
-          error,
-          collectionName: model.name,
-          record,
-        }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -87,12 +82,7 @@ export class SQLiteStateStore<TModel extends Model>
           params,
         );
       },
-      (error) =>
-        new StoreQueryError(error.message, {
-          error,
-          collectionName: model.name,
-          record,
-        }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -109,12 +99,7 @@ export class SQLiteStateStore<TModel extends Model>
           { $id: id },
         );
       },
-      (error) =>
-        new StoreQueryError(error.message, {
-          error,
-          collectionName: model.name,
-          id,
-        }),
+      (error) => new StoreQueryError(error.message),
     );
   }
 
@@ -130,11 +115,7 @@ export class SQLiteStateStore<TModel extends Model>
           }
         });
       },
-      (error) =>
-        new StoreQueryError(error.message, {
-          error,
-          schema: this.schema,
-        }),
+      (error) => new StoreQueryError(error.message),
     );
   }