diff --git a/packages/components/src/components/badge/badge.tsx b/packages/components/src/components/badge/badge.tsx
index cad4bbd..d5ef217 100644
--- a/packages/components/src/components/badge/badge.tsx
+++ b/packages/components/src/components/badge/badge.tsx
@@ -125,13 +125,13 @@ const Badge = ({
   const commonProps = {
     "data-shape": shape,
     "data-variant": variant,
-    "data-disabled": disabled,
+    "data-disabled": disabled || undefined,
     className: cn(
-      'relative inline-flex w-fit items-center font-medium data-[disabled="true"]:cursor-not-allowed',
+      "relative inline-flex w-fit items-center font-medium data-disabled:cursor-not-allowed",
       "data-[shape='pill']:rounded-full",
       "data-[variant='outline']:outline-1 data-[variant='outline']:outline-[rgba(11,12,14,0.08)] data-[variant='outline']:outline-solid data-[variant='outline']:-outline-offset-1 dark:data-[variant='outline']:outline-[rgba(255,255,255,0.14)]",
-      'bg-(--color-bg) text-(--color-text) data-[disabled="true"]:bg-(--color-bg-disabled) data-[disabled="true"]:text-(--color-text-disabled)',
-      '[&_[data-component-part$="-icon"][data-icon-type="string"]_svg]:bg-(--color-text) data-[disabled="true"]:[&_[data-component-part$="-icon"][data-icon-type="string"]_svg]:bg-(--color-text-disabled)',
+      "bg-(--color-bg) text-(--color-text) data-disabled:bg-(--color-bg-disabled) data-disabled:text-(--color-text-disabled)",
+      '[&_[data-component-part$="-icon"][data-icon-type="string"]_svg]:bg-(--color-text) data-disabled:[&_[data-component-part$="-icon"][data-icon-type="string"]_svg]:bg-(--color-text-disabled)',
       '[&_[data-component-part$="-icon"][data-icon-type="inline"]_svg]:fill-current',
       sizeVariants[size],
       colorVariants[color],
diff --git a/packages/components/src/components/code-group/dropdown.tsx b/packages/components/src/components/code-group/dropdown.tsx
index ad49584..ef359e7 100644
--- a/packages/components/src/components/code-group/dropdown.tsx
+++ b/packages/components/src/components/code-group/dropdown.tsx
@@ -83,7 +83,7 @@ const DropdownMenuItem = ({
 }: DropdownMenuItemProps) => (
   <Menu.Item
     className={cn(
-      "group relative flex w-full cursor-pointer select-none items-center justify-between gap-2 rounded-md px-2 py-1 text-sm outline-0 hover:bg-stone-950/[0.03] focus:bg-stone-950/5 data-[disabled]:pointer-events-none data-[disabled]:cursor-default data-[disabled]:opacity-50 dark:focus:bg-white/5 dark:hover:bg-white/[0.03]",
+      "group relative flex w-full cursor-pointer select-none items-center justify-between gap-2 rounded-md px-2 py-1 text-sm outline-0 hover:bg-stone-950/3 focus:bg-stone-950/5 data-disabled:pointer-events-none data-disabled:cursor-default data-disabled:opacity-50 dark:focus:bg-white/5 dark:hover:bg-white/3",
       isSelected
         ? "font-medium text-primary dark:text-primary-light"
         : "text-stone-950/50 hover:text-stone-950/75 focus:text-stone-950/75 dark:text-white/50 dark:focus:text-white/75 dark:hover:text-white/75",