diff --git a/client/src/Components/MonitorDetailsControlHeader/index.jsx b/client/src/Components/MonitorDetailsControlHeader/index.jsx
index 920d5a29c..aa9ef91b9 100644
--- a/client/src/Components/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/MonitorDetailsControlHeader/index.jsx
@@ -65,7 +65,9 @@ const MonitorDetailsControlHeader = ({
 					color="secondary"
 					loading={isSending}
 					startIcon={<EmailIcon />}
-					onClick={sendTestEmail}
+					onClick={() => {
+						sendTestEmail();
+					}}
 				>
 					{t("sendTestEmail")}
 				</Button>
diff --git a/server/service/emailService.js b/server/service/emailService.js
index 6e6a70684..035cc6505 100755
--- a/server/service/emailService.js
+++ b/server/service/emailService.js
@@ -92,11 +92,10 @@ class EmailService {
 	buildAndSendEmail = async (template, context, to, subject, transportConfig) => {
 		// TODO - Consider an update transporter method so this only needs to be recreated when smtp settings change
 		let config;
-
 		if (typeof transportConfig !== "undefined") {
 			config = transportConfig;
 		} else {
-			config = this.settingsService.getDBSettings();
+			config = await this.settingsService.getDBSettings();
 		}
 
 		const {