diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index bc3d168639..90f71bf88f 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -166,7 +166,7 @@ frappe.ui.form.on("Email Account", {
 	},
 
 	show_oauth_authorization_message(frm) {
-		if (frm.doc.auth_method === "OAuth") {
+		if (frm.doc.auth_method === "OAuth" && frm.doc.connected_app) {
 			frappe.call({
 				method: "frappe.integrations.doctype.connected_app.connected_app.has_token",
 				args: {
diff --git a/frappe/integrations/doctype/connected_app/connected_app.py b/frappe/integrations/doctype/connected_app/connected_app.py
index 96f23afc1c..536b63fe7b 100644
--- a/frappe/integrations/doctype/connected_app/connected_app.py
+++ b/frappe/integrations/doctype/connected_app/connected_app.py
@@ -167,4 +167,4 @@ def callback(code=None, state=None):
 def has_token(connected_app, connected_user=None):
 	app = frappe.get_doc("Connected App", connected_app)
 	token_cache = app.get_token_cache(connected_user or frappe.session.user)
-	return bool(token_cache.get_password("access_token", False))
+	return bool(token_cache and token_cache.get_password("access_token", False))