diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index c482707e15..c8fc085fa0 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1369,6 +1369,9 @@ command_no_begin(const char *query)
 			return true;
 	}
 
+	if (wordlen == 7 && pg_strncasecmp(query, "discard", 7) == 0)
+		return true;
+
 	return false;
 }