diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c
index c819d19..e73bad3 100644
*** a/src/backend/executor/execIndexing.c
--- b/src/backend/executor/execIndexing.c
*************** ExecInsertIndexTuples(TupleTableSlot *sl
*** 407,413 ****
  			bool		violationOK;
  			CEOUC_WAIT_MODE waitMode;
  
! 			if (noDupErr)
  			{
  				violationOK = true;
  				waitMode = CEOUC_LIVELOCK_PREVENTING_WAIT;
--- 407,413 ----
  			bool		violationOK;
  			CEOUC_WAIT_MODE waitMode;
  
! 			if (noDupErr && (arbiterIndexes == NIL || arbiter))
  			{
  				violationOK = true;
  				waitMode = CEOUC_LIVELOCK_PREVENTING_WAIT;