diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
new file mode 100644
index 1495bb4..9b6da95
*** a/src/backend/access/transam/xact.c
--- b/src/backend/access/transam/xact.c
*************** CommitTransaction(void)
*** 1958,1963 ****
--- 1958,1969 ----
  	 */
  	s->state = TRANS_DEFAULT;
  
+ 	/*
+ 	 * We have already committed, so clear any cancel requests
+ 	 * that might be processed later.
+ 	 */
+ 	QueryCancelPending = false;
+ 
  	RESUME_INTERRUPTS();
  }