diff --git a/main/asterisk.c b/main/asterisk.c
index 991e9f98a5..03c6b18ab9 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -1432,6 +1432,11 @@ static void __quit_handler(int num)
 	 * is going to exit */
 }
 
+static void __remote_quit_handler(int num)
+{
+	sig_flags.need_quit = 1;
+}
+
 static const char *fix_header(char *outbuf, int maxout, const char *s, char *cmp)
 {
 	const char *c;
@@ -2433,6 +2438,11 @@ static void ast_remotecontrol(char *data)
 	char *ebuf;
 	int num = 0;
 
+	memset(&sig_flags, 0, sizeof(sig_flags));
+	signal(SIGINT, __remote_quit_handler);
+	signal(SIGTERM, __remote_quit_handler);
+	signal(SIGHUP, __remote_quit_handler);
+
 	if (read(ast_consock, buf, sizeof(buf)) < 0) {
 		ast_log(LOG_ERROR, "read() failed: %s\n", strerror(errno));
 		return;
@@ -2440,6 +2450,9 @@ static void ast_remotecontrol(char *data)
 	if (data) {
 		if (write(ast_consock, data, strlen(data) + 1) < 0) {
 			ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
+			if (sig_flags.need_quit == 1) {
+				return;
+			}
 		}
 	}
 	stringp = buf;
@@ -2485,6 +2498,10 @@ static void ast_remotecontrol(char *data)
 			char buf[512] = "", *curline = buf, *nextline;
 			int not_written = 1;
 
+			if (sig_flags.need_quit == 1) {
+				break;
+			}
+
 			if (read(ast_consock, buf, sizeof(buf) - 1) <= 0) {
 				break;
 			}
@@ -2516,6 +2533,10 @@ static void ast_remotecontrol(char *data)
 	for (;;) {
 		ebuf = (char *)el_gets(el, &num);
 
+		if (sig_flags.need_quit == 1) {
+			break;
+		}
+
 		if (!ebuf && write(1, "", 1) < 0)
 			break;