diff --git a/.changeset/ninety-llamas-search.md b/.changeset/ninety-llamas-search.md
new file mode 100644
index 0000000000..85a3bdfec3
--- /dev/null
+++ b/.changeset/ninety-llamas-search.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/vue-components": major
+---
+
+Adds A11y support to CommandButton
diff --git a/packages/infra/src/Store/Cosmos.ts b/packages/infra/src/Store/Cosmos.ts
index 08171db0d8..45c6ac9df3 100644
--- a/packages/infra/src/Store/Cosmos.ts
+++ b/packages/infra/src/Store/Cosmos.ts
@@ -258,7 +258,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                       attributes: { "repository.container_id": containerId, "repository.model_name": name }
                     })
                 ),
-            batchRemove: (ids, partitionKey?: string | undefined) =>
+            batchRemove: (ids, partitionKey?: string) =>
               Effect.promise(() =>
                 execBatch(
                   mutable(ids.map((id) =>
diff --git a/packages/infra/src/Store/service.ts b/packages/infra/src/Store/service.ts
index 3679b067cd..e162675396 100644
--- a/packages/infra/src/Store/service.ts
+++ b/packages/infra/src/Store/service.ts
@@ -85,7 +85,7 @@ export interface Store<
   bulkSet: (
     items: NonEmptyReadonlyArray<PM>
   ) => Effect.Effect<NonEmptyReadonlyArray<PM>, OptimisticConcurrencyException>
-  batchRemove: (ids: NonEmptyReadonlyArray<Encoded[IdKey]>, partitionKey?: string | undefined) => Effect.Effect<void>
+  batchRemove: (ids: NonEmptyReadonlyArray<Encoded[IdKey]>, partitionKey?: string) => Effect.Effect<void>
   queryRaw: <Out>(query: RawQuery<Encoded, Out>) => Effect.Effect<readonly Out[]>
 }
 
diff --git a/packages/vue-components/src/components/CommandButton.vue b/packages/vue-components/src/components/CommandButton.vue
index d4166a1961..200291d963 100644
--- a/packages/vue-components/src/components/CommandButton.vue
+++ b/packages/vue-components/src/components/CommandButton.vue
@@ -4,6 +4,7 @@
   generic="I = never"
 >
 import type { CommandBase } from "@effect-app/vue"
+import { computed } from "vue"
 import type { VBtn } from "vuetify/components"
 
 export type VBtnProps = VBtn["$props"]
@@ -28,6 +29,20 @@ const props = defineProps<
   }
   & ButtonProps
 >()
+
+const isDisabled = computed(() => props.command.blocked || props.disabled)
+
+const handleClick = () => {
+  // Block execution if button is disabled
+  if (isDisabled.value) {
+    return
+  }
+
+  const input = ("input" in props && props.input
+    ? props.input
+    : undefined) as unknown as I
+  ;(props.command.handle as any)(input)
+}
 </script>
 <script lang="ts">
 /** Command Button is an easy way to connect commands and have it execute on click, while keeping track of disabled/loading states automatically */
@@ -40,17 +55,14 @@ export default {
     v-if="command.allowed && !empty"
     v-bind="$attrs"
     :loading="command.waiting"
-    :disabled="command.blocked || disabled"
+    :aria-disabled="isDisabled"
     :title="title ?? command.action"
-    @click="(command.handle as any)(
-      (`input` in props && props.input
-        ? props.input
-        : undefined) as unknown as I
-    )"
+    :class="{ 'v-btn--disabled': isDisabled }"
+    @click="handleClick"
   >
     <slot
       :loading="command.waiting"
-      :disabled="command.blocked || disabled"
+      :disabled="isDisabled"
       :label="command.label"
       :title="title ?? command.action"
     >
@@ -61,12 +73,9 @@ export default {
     v-else-if="command.allowed"
     v-bind="$attrs"
     :loading="command.waiting"
-    :disabled="command.blocked || disabled"
+    :aria-disabled="isDisabled"
     :title="title ?? command.action"
-    @click="(command.handle as any)(
-      (`input` in props && props.input
-        ? props.input
-        : undefined) as unknown as I
-    )"
+    :class="{ 'v-btn--disabled': isDisabled }"
+    @click="handleClick"
   />
 </template>
diff --git a/packages/vue/src/query.ts b/packages/vue/src/query.ts
index 14bbfc397c..7c99810398 100644
--- a/packages/vue/src/query.ts
+++ b/packages/vue/src/query.ts
@@ -59,7 +59,6 @@ export interface CustomDefinedInitialQueryOptions<
     | undefined
     | NonFunctionGuard<TQueryData>
     | PlaceholderDataFunction<NonFunctionGuard<TQueryData>, TError, NonFunctionGuard<TQueryData>, TQueryKey>
-    | undefined
 }
 
 export interface CustomDefinedPlaceholderQueryOptions<