diff --git a/dashboard/components/drawer/Pricing.vue b/dashboard/components/drawer/Pricing.vue
index 6a0540a..ea67e18 100644
--- a/dashboard/components/drawer/Pricing.vue
+++ b/dashboard/components/drawer/Pricing.vue
@@ -195,6 +195,9 @@ function getPricingsData() {
 
         <div class="flex justify-between items-center mt-10 flex-col xl:flex-row">
             <div class="flex flex-col gap-2">
+                <div class="poppins text-[1.1rem] text-lyx-lightmode-text dark:text-yellow-400 mb-2">
+                    *Plan upgrades are applicable exclusively to this project(workspace).
+                </div>
                 <div class="poppins text-[2rem] font-semibold">
                     Do you need help ?
                 </div>
diff --git a/dashboard/components/settings/Codes.vue b/dashboard/components/settings/Codes.vue
index 22067fa..95af420 100644
--- a/dashboard/components/settings/Codes.vue
+++ b/dashboard/components/settings/Codes.vue
@@ -53,6 +53,9 @@ async function redeemCode() {
             <div class="text-lyx-text-darker mt-1 text-[.9rem] poppins">
                 Redeemed codes: {{ valid_codes.data.value?.count || '0' }}
             </div>
+            <div class="poppins text-[1.1rem] text-lyx-lightmode-text dark:text-yellow-400 mb-2">
+                *Plan upgrades are applicable exclusively to this project(workspace).
+            </div>
         </template>
     </SettingsTemplate>
 </template>
diff --git a/dashboard/composables/useSelfhosted.ts b/dashboard/composables/useSelfhosted.ts
index d40f9ed..8df1f34 100644
--- a/dashboard/composables/useSelfhosted.ts
+++ b/dashboard/composables/useSelfhosted.ts
@@ -3,5 +3,5 @@
 const app = useRuntimeConfig();
 
 export function useSelfhosted() {
-    return app.public.SELFHOSTED === 'TRUE';
+    return app.public.SELFHOSTED === 'TRUE' || app.public.SELFHOSTED !== 'true';
 }
\ No newline at end of file
diff --git a/dashboard/layouts/dashboard.vue b/dashboard/layouts/dashboard.vue
index 07b405a..56e172e 100644
--- a/dashboard/layouts/dashboard.vue
+++ b/dashboard/layouts/dashboard.vue
@@ -32,6 +32,7 @@ const sections: Section[] = [
                 action() {
                     modal.open(DialogFeedback, {});
                 },
+                disabled: selfhosted
             },
             {
                 label: 'Documentation', to: 'https://docs.litlyx.com', icon: 'fal fa-book', external: true,
diff --git a/dashboard/pages/analyst.vue b/dashboard/pages/analyst.vue
index 5ed2a02..0700c57 100644
--- a/dashboard/pages/analyst.vue
+++ b/dashboard/pages/analyst.vue
@@ -4,6 +4,7 @@ import VueMarkdown from 'vue-markdown-render';
 
 definePageMeta({ layout: 'dashboard' });
 
+const selfhosted = useSelfhosted();
 
 const debugModeAi = ref<boolean>(false);
 
@@ -87,6 +88,7 @@ async function pollSendMessageStatus(chat_id: string, times: number, updateStatu
         currentChatMessages.value = messages.map(e => ({ ...e, charts: e.charts.map(k => JSON.parse(k)) })) as any;
         currentChatMessageDelta.value = '';
 
+        loading.value = false;
     }
 
 }
@@ -366,7 +368,8 @@ async function clearAllChats() {
 
                 <div class="flex gap-2 items-center md:absolute fixed bottom-8 left-0 w-full px-10 xl:px-28">
                     <input @keydown="onKeyDown" v-model="currentText"
-                        class="bg-lyx-lightmode-widget-light dark:bg-lyx-widget-light w-full dark:focus:outline-none px-4 py-2 rounded-lg outline-[1px] outline outline-lyx-lightmode-widget dark:outline-none" type="text">
+                        class="bg-lyx-lightmode-widget-light dark:bg-lyx-widget-light w-full dark:focus:outline-none px-4 py-2 rounded-lg outline-[1px] outline outline-lyx-lightmode-widget dark:outline-none"
+                        type="text">
                     <div @click="sendMessage()"
                         class="bg-lyx-lightmode-widget-light hover:bg-lyx-lightmode-widget dark:bg-lyx-widget-light dark:hover:bg-lyx-widget-light cursor-pointer px-4 py-2 rounded-full">
                         <i class="far fa-arrow-up"></i>
@@ -384,7 +387,7 @@ async function clearAllChats() {
                 'absolute top-0 left-0 w-full': menuOpen,
                 'hidden xl:flex': !menuOpen
             }"
-                class="flex-[2] bg-lyx-lightmode-background border-l-[1px] dark:bg-lyx-background-light p-6 flex flex-col gap-4 h-full overflow-hidden">
+                class="flex-[2] bg-lyx-lightmode-background border-l-[1px] dark:border-l-0 dark:bg-lyx-background-light p-6 flex flex-col gap-4 h-full overflow-hidden">
 
                 <div class="gap-2 flex flex-col">
                     <div class="xl:hidden absolute right-6 top-2 text-[1.5rem]">
@@ -403,7 +406,7 @@ async function clearAllChats() {
                             chatsRemaining }} remaining requests
                         </div>
                     </div>
-                    <LyxUiButton type="primary" class="text-[.9rem] text-center " @click="showDrawer('PRICING')">
+                    <LyxUiButton v-if="!selfhosted" type="primary" class="text-[.9rem] text-center " @click="showDrawer('PRICING')">
                         Upgrade
                     </LyxUiButton>
                 </div>
diff --git a/dashboard/pages/settings.vue b/dashboard/pages/settings.vue
index 6fb85cf..fe9a333 100644
--- a/dashboard/pages/settings.vue
+++ b/dashboard/pages/settings.vue
@@ -2,6 +2,7 @@
 
 definePageMeta({ layout: 'dashboard' });
 
+const selfhosted = useSelfhosted();
 
 const items = [
     { label: 'General', slot: 'general' },
@@ -16,7 +17,7 @@ const items = [
 
 <template>
     <div class="lg:px-10 lg:py-8 h-dvh overflow-y-auto overflow-x-hidden hide-scrollbars">
-        
+
         <div class="poppins font-semibold text-[1.3rem] lg:px-0 px-4 lg:py-0 py-4"> Settings </div>
 
         <CustomTab :items="items" class="mt-8">
@@ -30,10 +31,18 @@ const items = [
                 <SettingsMembers :key="refreshKey"></SettingsMembers>
             </template>
             <template #billing>
-                <SettingsBilling :key="refreshKey"></SettingsBilling>
+                <SettingsBilling v-if="!selfhosted" :key="refreshKey"></SettingsBilling>
+                <div class="flex popping text-[1.2rem] font-semibold justify-center mt-[20vh] text-lyx-lightmode-text dark:text-lyx-text"
+                    v-if="selfhosted">
+                    Billing disabled in self-host mode
+                </div>
             </template>
             <template #codes>
-                <SettingsCodes :key="refreshKey"></SettingsCodes>
+                <SettingsCodes v-if="!selfhosted" :key="refreshKey"></SettingsCodes>
+                <div class="flex popping text-[1.2rem] font-semibold justify-center mt-[20vh] text-lyx-lightmode-text dark:text-lyx-text"
+                    v-if="selfhosted">
+                    Codes disabled in self-host mode
+                </div>
             </template>
             <template #account>
                 <SettingsAccount :key="refreshKey"></SettingsAccount>
diff --git a/dashboard/server/api/project/generate_csv.ts b/dashboard/server/api/project/generate_csv.ts
index 4b13f2b..e264ed0 100644
--- a/dashboard/server/api/project/generate_csv.ts
+++ b/dashboard/server/api/project/generate_csv.ts
@@ -66,7 +66,7 @@ export default defineEventHandler(async event => {
     const { project, project_id, user } = data;
 
 
-    if (SELFHOSTED !== 'TRUE') {
+    if (SELFHOSTED !== 'TRUE' && SELFHOSTED !== 'true') {
         const PREMIUM_TYPE = project.premium_type;
         if (PREMIUM_TYPE === 0) return setResponseStatus(event, 400, 'Project not premium');
     }