diff --git a/lgsm/functions/command_monitor.sh b/lgsm/functions/command_monitor.sh
index 917b544b7..64d11cf62 100644
--- a/lgsm/functions/command_monitor.sh
+++ b/lgsm/functions/command_monitor.sh
@@ -84,7 +84,8 @@ fn_monitor_tmux(){
 		fn_print_fail "Checking session: "
 		fn_print_fail_eol_nl
 		fn_scriptlog "Checking session: FAIL"
-		fn_monitor_email_alert
+		alert="restart"
+		alert.sh
 		fn_scriptlog "Monitor is starting ${servername}"
 		sleep 1
 		command_start.sh
diff --git a/lgsm/functions/command_test_alert.sh b/lgsm/functions/command_test_alert.sh
index 253ab07d3..33cb25ea1 100644
--- a/lgsm/functions/command_test_alert.sh
+++ b/lgsm/functions/command_test_alert.sh
@@ -11,10 +11,8 @@ function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 
 check.sh
 info_config.sh
-if [ "${emailalert}" = "on" ]||[ "${pushbulletalert}" = "on" ]; then
-	alert="test"
+alert="test"
 	alert.sh
-else
 	fn_print_fail_nl "alerts not enabled"
 	fn_scriptlog "alerts not enabled"
 fi
\ No newline at end of file
diff --git a/lgsm/functions/monitor_gsquery.sh b/lgsm/functions/monitor_gsquery.sh
index 20c7dc3ce..240b0ca0f 100644
--- a/lgsm/functions/monitor_gsquery.sh
+++ b/lgsm/functions/monitor_gsquery.sh
@@ -70,9 +70,8 @@ if [ "${gsquery}" == "yes" ]; then
 
 				# Send alert if enabled
 				if [ "${emailalert}" == "on" ]; then
-					subject="${servicename} Monitor - Starting ${servername}"
-					failurereason="Failed to query ${servicename}: ${gsquerycmd}"
-					actiontaken="restarted ${servicename}"
+
+					alert="queryrestart"
 					alert.sh
 				fi
 				fn_restart