diff --git a/resources/js/Components/Common/UpgradeBadge.vue b/resources/js/Components/Common/UpgradeBadge.vue
index 62ef4c9a..d5f18454 100644
--- a/resources/js/Components/Common/UpgradeBadge.vue
+++ b/resources/js/Components/Common/UpgradeBadge.vue
@@ -1,13 +1,18 @@
 <script setup lang="ts">
 import { LockClosedIcon } from '@heroicons/vue/20/solid';
+import UpgradeModal from '@/Components/Common/UpgradeModal.vue';
+import { ref } from 'vue';
+const showUpgradeModal = ref(false);
 </script>
 
 <template>
-    <div
+    <UpgradeModal v-model:show="showUpgradeModal"></UpgradeModal>
+    <button
+        @click.prevent="showUpgradeModal = true"
         class="inline-flex bg-secondary hover:bg-tertiary px-2 py-1 rounded border border-border-secondary hover:border-border-tertiary items-center space-x-1">
         <LockClosedIcon class="w-3 text-text-tertiary"></LockClosedIcon>
         <span class="text-xs text-text-secondary font-semibold"> Upgrade </span>
-    </div>
+    </button>
 </template>
 
 <style scoped></style>
diff --git a/resources/js/Components/Common/UpgradeModal.vue b/resources/js/Components/Common/UpgradeModal.vue
new file mode 100644
index 00000000..f4fe9b1a
--- /dev/null
+++ b/resources/js/Components/Common/UpgradeModal.vue
@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import DialogModal from '@/packages/ui/src/DialogModal.vue';
+import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
+import { Link } from '@inertiajs/vue3';
+import {
+    isAllowedToPerformPremiumAction,
+    isBillingActivated,
+} from '@/utils/billing';
+import { CreditCardIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
+import { canManageBilling, canUpdateOrganization } from '@/utils/permissions';
+import { SecondaryButton } from '@/packages/ui/src';
+
+const show = defineModel('show', { default: false });
+</script>
+
+<template>
+    <DialogModal closeable :show="show" @close="show = false">
+        <template #title>
+            <div class="flex space-x-2">
+                <span> Upgrade Plan </span>
+            </div>
+        </template>
+
+        <template #content>
+            <div v-if="!isAllowedToPerformPremiumAction()">
+                <div
+                    class="rounded-full flex items-center justify-center w-20 h-20 mx-auto border border-border-tertiary bg-secondary">
+                    <UserGroupIcon class="w-12"></UserGroupIcon>
+                </div>
+                <div class="max-w-sm text-center mx-auto py-4 text-base">
+                    <p class="py-1">
+                        <strong>Project and Task Estimates</strong> is only
+                        available in solidtime Professional.
+                    </p>
+                    <p class="py-1">
+                        If you want to use this feature,
+                        <strong>please upgrade to a paid plan</strong>.
+                    </p>
+
+                    <Link
+                        v-if="isBillingActivated() && canManageBilling()"
+                        href="/billing">
+                        <PrimaryButton
+                            type="button"
+                            class="mt-6"
+                            v-if="
+                                isBillingActivated() && canUpdateOrganization()
+                            ">
+                            <CreditCardIcon class="w-5 h-5 me-2" />
+                            Go to Billing
+                        </PrimaryButton>
+                    </Link>
+                </div>
+            </div>
+        </template>
+        <template #footer>
+            <SecondaryButton @click="show = false">Close</SecondaryButton>
+        </template>
+    </DialogModal>
+</template>
+
+<style scoped></style>
diff --git a/resources/js/utils/billing.ts b/resources/js/utils/billing.ts
index 34ba995f..b83ef6e1 100644
--- a/resources/js/utils/billing.ts
+++ b/resources/js/utils/billing.ts
@@ -59,7 +59,6 @@ export function hasActiveSubscription() {
 }
 
 export function isAllowedToPerformPremiumAction() {
-    return true;
     return (
         !isBillingActivated() ||
         (isBillingActivated() && hasActiveSubscription()) ||