diff --git a/crm/api/contact.py b/crm/api/contact.py
index b8d8f578..6a812d5f 100644
--- a/crm/api/contact.py
+++ b/crm/api/contact.py
@@ -30,15 +30,7 @@ def get_contact(name):
 
 	if not len(contact):
 		frappe.throw(_("Contact not found"), frappe.DoesNotExistError)
-	contact = contact.pop()
 
-	contact["doctype"] = "Contact"
-	contact["email_ids"] = frappe.get_all(
-		"Contact Email", filters={"parent": name}, fields=["name", "email_id", "is_primary"]
-	)
-	contact["phone_nos"] = frappe.get_all(
-		"Contact Phone", filters={"parent": name}, fields=["name", "phone", "is_primary_mobile_no"]
-	)
 	return contact
 
 
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index bfe7ea76..18fccd2d 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -168,7 +168,11 @@
       </template>
     </Tabs>
   </div>
-  <ErrorPage v-else :errorTitle="errorTitle" :errorMessage="errorMessage" />
+  <ErrorPage
+    v-else-if="errorTitle"
+    :errorTitle="errorTitle"
+    :errorMessage="errorMessage"
+  />
   <AddressModal v-model="showAddressModal" v-model:address="_address" />
 </template>
 
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index bd0e9c49..3c1ce8b4 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -160,7 +160,11 @@
       </template>
     </Tabs>
   </div>
-  <ErrorPage v-else :errorTitle="errorTitle" :errorMessage="errorMessage" />
+  <ErrorPage
+    v-else-if="errorTitle"
+    :errorTitle="errorTitle"
+    :errorMessage="errorMessage"
+  />
   <QuickEntryModal
     v-if="showQuickEntryModal"
     v-model="showQuickEntryModal"