diff --git a/apps/dashboard/src/app.postcss b/apps/dashboard/src/app.postcss
index 910bae5c..f9a5c7ff 100644
--- a/apps/dashboard/src/app.postcss
+++ b/apps/dashboard/src/app.postcss
@@ -128,7 +128,7 @@ code {
 }
 
 .bx--list-box__menu-item__option {
-  white-space: normal;
+  white-space: normal !important;
 }
 .bx--list-box--xl .bx--list-box__menu-item,
 .bx--list-box--lg .bx--list-box__menu-item,
diff --git a/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte b/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte
index f95c7c07..fe77c09e 100644
--- a/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte
+++ b/apps/dashboard/src/lib/components/Org/Settings/OrgSettings.svelte
@@ -92,8 +92,6 @@
   function gotoSetting(pathname) {
     goto(`${$currentOrgPath}/settings${pathname}`);
   }
-
-  $: console.log('theme', $currentOrg.theme);
 </script>
 
 <Grid class="border-c rounded border-gray-200 w-full mt-5">
diff --git a/apps/dashboard/src/lib/utils/functions/theme.ts b/apps/dashboard/src/lib/utils/functions/theme.ts
index 832f77ad..031f13fc 100644
--- a/apps/dashboard/src/lib/utils/functions/theme.ts
+++ b/apps/dashboard/src/lib/utils/functions/theme.ts
@@ -2,7 +2,7 @@ export function setTheme(theme?: string) {
   // In case the default theme is added but another theme exists
   if (!theme && document.body.className.includes('theme-')) {
     const regex = /theme-[\w]+/gi;
-    document.body.className = document.body.className.replace(regex, theme);
+    document.body.className = document.body.className.replace(regex, theme || '');
     return;
   }