diff --git a/src/platform/assets/composables/useAssetFilterOptions.ts b/src/platform/assets/composables/useAssetFilterOptions.ts
index c7b874be6..30572d8c9 100644
--- a/src/platform/assets/composables/useAssetFilterOptions.ts
+++ b/src/platform/assets/composables/useAssetFilterOptions.ts
@@ -1,3 +1,4 @@
+import { uniqWith } from 'es-toolkit'
 import { computed } from 'vue'
 
 import type { SelectOption } from '@/components/input/types'
@@ -13,22 +14,19 @@ export function useAssetFilterOptions(assets: AssetItem[] = []) {
    * Returns sorted SelectOption array with extensions
    */
   const availableFileFormats = computed<SelectOption[]>(() => {
-    const formats = new Set<string>()
+    const extensions = assets
+      .map((asset) => {
+        const extension = asset.name.split('.').pop()
+        return extension && extension !== asset.name ? extension : null
+      })
+      .filter((extension): extension is string => extension !== null)
 
-    assets.forEach((asset) => {
-      const extension = asset.name.split('.').pop()
-      if (extension && extension !== asset.name) {
-        // Only add if there was actually an extension (not just the filename)
-        formats.add(extension)
-      }
-    })
+    const uniqueExtensions = uniqWith(extensions, (a, b) => a === b)
 
-    return Array.from(formats)
-      .sort()
-      .map((format) => ({
-        name: `.${format}`,
-        value: format
-      }))
+    return uniqueExtensions.sort().map((format) => ({
+      name: `.${format}`,
+      value: format
+    }))
   })
 
   /**
@@ -36,21 +34,19 @@ export function useAssetFilterOptions(assets: AssetItem[] = []) {
    * Returns sorted SelectOption array with base model names
    */
   const availableBaseModels = computed<SelectOption[]>(() => {
-    const models = new Set<string>()
+    const models = assets
+      .map((asset) => asset.user_metadata?.base_model)
+      .filter(
+        (baseModel): baseModel is string =>
+          baseModel !== undefined && typeof baseModel === 'string'
+      )
 
-    assets.forEach((asset) => {
-      const baseModel = asset.user_metadata?.base_model
-      if (baseModel && typeof baseModel === 'string') {
-        models.add(baseModel)
-      }
-    })
+    const uniqueModels = uniqWith(models, (a, b) => a === b)
 
-    return Array.from(models)
-      .sort()
-      .map((model) => ({
-        name: model,
-        value: model
-      }))
+    return uniqueModels.sort().map((model) => ({
+      name: model,
+      value: model
+    }))
   })
 
   return {
diff --git a/tests-ui/platform/assets/composables/useAssetBrowserDialog.test.ts b/tests-ui/platform/assets/composables/useAssetBrowserDialog.test.ts
index 029bf3148..fefeeceac 100644
--- a/tests-ui/platform/assets/composables/useAssetBrowserDialog.test.ts
+++ b/tests-ui/platform/assets/composables/useAssetBrowserDialog.test.ts
@@ -1,17 +1,10 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 
 import { useAssetBrowserDialog } from '@/platform/assets/composables/useAssetBrowserDialog'
+import { useDialogStore } from '@/stores/dialogStore'
 
 // Mock the dialog store
-let mockShowDialog: ReturnType<typeof vi.fn>
-let mockCloseDialog: ReturnType<typeof vi.fn>
-
-vi.mock('@/stores/dialogStore', () => ({
-  useDialogStore: vi.fn(() => ({
-    showDialog: mockShowDialog,
-    closeDialog: mockCloseDialog
-  }))
-}))
+vi.mock('@/stores/dialogStore')
 
 // Test factory functions
 interface AssetBrowserProps {
@@ -31,16 +24,20 @@ function createAssetBrowserProps(
 }
 
 describe('useAssetBrowserDialog', () => {
-  let assetBrowserDialog: ReturnType<typeof useAssetBrowserDialog>
-
-  beforeEach(() => {
-    mockShowDialog = vi.fn()
-    mockCloseDialog = vi.fn()
-    assetBrowserDialog = useAssetBrowserDialog()
-  })
-
   describe('Asset Selection Flow', () => {
     it('auto-closes dialog when asset is selected', () => {
+      // Create fresh mocks for this test
+      const mockShowDialog = vi.fn()
+      const mockCloseDialog = vi.fn()
+
+      vi.mocked(useDialogStore).mockReturnValue({
+        showDialog: mockShowDialog,
+        closeDialog: mockCloseDialog
+      } as Partial<ReturnType<typeof useDialogStore>> as ReturnType<
+        typeof useDialogStore
+      >)
+
+      const assetBrowserDialog = useAssetBrowserDialog()
       const onAssetSelected = vi.fn()
       const props = createAssetBrowserProps({ onAssetSelected })
 
@@ -61,6 +58,18 @@ describe('useAssetBrowserDialog', () => {
     })
 
     it('closes dialog when close handler is called', () => {
+      // Create fresh mocks for this test
+      const mockShowDialog = vi.fn()
+      const mockCloseDialog = vi.fn()
+
+      vi.mocked(useDialogStore).mockReturnValue({
+        showDialog: mockShowDialog,
+        closeDialog: mockCloseDialog
+      } as Partial<ReturnType<typeof useDialogStore>> as ReturnType<
+        typeof useDialogStore
+      >)
+
+      const assetBrowserDialog = useAssetBrowserDialog()
       const props = createAssetBrowserProps()
 
       assetBrowserDialog.show(props)