diff --git a/main/asterisk.c b/main/asterisk.c
index 35ac9fe965..04b030bbfc 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2014,7 +2014,7 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart)
 		run_cleanups = 0;
 	}
 
-	if (!restart) {
+	if (!restart && !ast_opt_remote) {
 		ast_sd_notify("STOPPING=1");
 	}
 	if (ast_opt_console || (ast_opt_remote && !ast_opt_exec)) {
diff --git a/main/loader.c b/main/loader.c
index 4c1b59d067..9b97590806 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -1578,7 +1578,7 @@ enum ast_module_reload_result ast_module_reload(const char *name)
 		res = AST_MODULE_RELOAD_IN_PROGRESS;
 		goto module_reload_exit;
 	}
-	ast_sd_notify("RELOAD=1");
+	ast_sd_notify("RELOADING=1");
 	ast_lastreloadtime = ast_tvnow();
 
 	if (ast_opt_lock_confdir) {