diff --git a/.changeset/khaki-weeks-film.md b/.changeset/khaki-weeks-film.md
new file mode 100644
index 00000000..8829c4a1
--- /dev/null
+++ b/.changeset/khaki-weeks-film.md
@@ -0,0 +1,5 @@
+---
+"@devup-ui/react": patch
+---
+
+Fix typing issue
diff --git a/packages/react/src/utils/get-theme.ts b/packages/react/src/utils/get-theme.ts
index 47fc7643..134e8445 100644
--- a/packages/react/src/utils/get-theme.ts
+++ b/packages/react/src/utils/get-theme.ts
@@ -2,6 +2,8 @@
 
 import { DevupTheme } from '../types/theme'
 
-export function getTheme(): keyof DevupTheme | null {
+export function getTheme():
+  | (keyof DevupTheme extends undefined ? string : keyof DevupTheme)
+  | null {
   return document.documentElement.getAttribute('data-theme') as keyof DevupTheme
 }
diff --git a/packages/react/src/utils/set-theme.ts b/packages/react/src/utils/set-theme.ts
index 92f642d3..94269790 100644
--- a/packages/react/src/utils/set-theme.ts
+++ b/packages/react/src/utils/set-theme.ts
@@ -2,7 +2,9 @@
 
 import { DevupTheme } from '../types/theme'
 
-export function setTheme(theme: keyof DevupTheme): void {
+export function setTheme(
+  theme: keyof DevupTheme extends undefined ? string : keyof DevupTheme,
+): void {
   document.documentElement.setAttribute('data-theme', theme)
   localStorage.setItem('__DF_THEME_SELECTED__', theme)
 }