diff --git a/packages/frontend-core/src/components/UserAvatars.svelte b/packages/frontend-core/src/components/UserAvatars.svelte
index d3bba07e..7e1acc33 100644
--- a/packages/frontend-core/src/components/UserAvatars.svelte
+++ b/packages/frontend-core/src/components/UserAvatars.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { Avatar, TooltipPosition } from "@supertoolmake/bbui"
-import { UserAvatar } from "@supertoolmake/frontend-core"
+import UserAvatar from "./UserAvatar.svelte"
 import type { UIUser } from "@supertoolmake/types"
 
 type OrderType = "ltr" | "rtl"
diff --git a/packages/shared-core/src/helpers/integrations.ts b/packages/shared-core/src/helpers/integrations.ts
index 343acbbf..247265d2 100644
--- a/packages/shared-core/src/helpers/integrations.ts
+++ b/packages/shared-core/src/helpers/integrations.ts
@@ -1,6 +1,10 @@
 import { SourceName } from "@supertoolmake/types"
 
-export function isSQL(datasource: { source: SourceName; isSQL?: boolean }): boolean {
+export function isSQL(datasource: { source: SourceName; isSQL?: boolean } | undefined): boolean {
+  if (!datasource) {
+    return false
+  }
+
   const SQL = [SourceName.POSTGRES, SourceName.SQL_SERVER, SourceName.MYSQL]
   return SQL.indexOf(datasource.source) !== -1 || datasource.isSQL === true
 }
diff --git a/packages/shared-core/src/helpers/tests/integrations.spec.ts b/packages/shared-core/src/helpers/tests/integrations.spec.ts
new file mode 100644
index 00000000..5f3298d4
--- /dev/null
+++ b/packages/shared-core/src/helpers/tests/integrations.spec.ts
@@ -0,0 +1,14 @@
+import { SourceName } from "@supertoolmake/types"
+import { isSQL } from "../integrations"
+
+describe("integration helpers", () => {
+  describe("isSQL", () => {
+    it("returns false when the datasource is unavailable", () => {
+      expect(isSQL(undefined)).toBe(false)
+    })
+
+    it("returns true for SQL datasources", () => {
+      expect(isSQL({ source: SourceName.POSTGRES })).toBe(true)
+    })
+  })
+})