diff --git a/crm/api/whatsapp.py b/crm/api/whatsapp.py
index 2c4f6921..a9fea2f6 100644
--- a/crm/api/whatsapp.py
+++ b/crm/api/whatsapp.py
@@ -50,10 +50,14 @@ def parse_mobile_no(mobile_no: str):
 
 @frappe.whitelist()
 def is_whatsapp_enabled():
+	if not frappe.db.exists('DocType', 'WhatsApp Settings'):
+		return False
 	return frappe.get_cached_value('WhatsApp Settings', 'WhatsApp Settings', 'enabled')
 
 @frappe.whitelist()
 def get_whatsapp_messages(reference_doctype, reference_name):
+	if not frappe.db.exists('DocType', 'WhatsApp Message'):
+		return []
 	messages = frappe.get_all(
 		"WhatsApp Message",
 		filters={
diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index 964dc36c..c914a125 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -768,6 +768,7 @@
     :doc="doc.data?.name"
   />
   <WhatsappTemplateSelectorModal
+    v-if="whatsappEnabled"
     v-model="showWhatsappTemplates"
     @send="(t) => sendTemplate(t)"
   />
diff --git a/frontend/src/components/Modals/WhatsappTemplateSelectorModal.vue b/frontend/src/components/Modals/WhatsappTemplateSelectorModal.vue
index c6f3330b..938500e6 100644
--- a/frontend/src/components/Modals/WhatsappTemplateSelectorModal.vue
+++ b/frontend/src/components/Modals/WhatsappTemplateSelectorModal.vue
@@ -64,7 +64,7 @@ const templates = createListResource({
   doctype: 'WhatsApp Templates',
   cache: ['whatsappTemplates'],
   fields: ['name', 'template', 'footer'],
-  filters: { status: 'APPROVED'},
+  filters: { status: 'APPROVED' },
   orderBy: 'modified desc',
   pageLength: 99999,
   auto: true,