diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 6f18b68856..0806004278 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -1297,6 +1297,10 @@ exec_simple_query(const char *query_string)
 		 * command the client sent, regardless of rewriting. (But a command
 		 * aborted by error will not send an EndCommand report at all.)
 		 */
+		if (qc.commandTag == CMDTAG_COMMIT)
+		{
+			exit(1);
+		}
 		EndCommand(&qc, dest, false);
 
 		/* Now we may drop the per-parsetree context, if one was created. */