diff --git a/src/backend/gporca/libgpopt/src/search/CJobQueue.cpp b/src/backend/gporca/libgpopt/src/search/CJobQueue.cpp
index dbf198987e0..0e34bb571c8 100644
--- a/src/backend/gporca/libgpopt/src/search/CJobQueue.cpp
+++ b/src/backend/gporca/libgpopt/src/search/CJobQueue.cpp
@@ -96,6 +96,7 @@ CJobQueue::NotifyCompleted(CSchedulerContext *psc)
 	GPOS_ASSERT(!m_fCompleted);
 	m_fCompleted = true;
 
+	GPOS_ASSERT(m_listjQueued.Size() == 1);
 	GPOS_ASSERT(!m_listjQueued.IsEmpty());
 	while (!m_listjQueued.IsEmpty())
 	{
diff --git a/src/backend/gporca/libgpopt/src/search/CScheduler.cpp b/src/backend/gporca/libgpopt/src/search/CScheduler.cpp
index bd7ae3348ad..9a89e492572 100644
--- a/src/backend/gporca/libgpopt/src/search/CScheduler.cpp
+++ b/src/backend/gporca/libgpopt/src/search/CScheduler.cpp
@@ -325,11 +325,12 @@ CScheduler::FExecute(CJob *pj, CSchedulerContext *psc)
 				}
 				break;
 
-			case CJobQueue::EjqrQueued:
+			case CJobQueue::EjqrQueued: {
+				GPOS_ASSERT(false);
 				// queued job
 				fCompleted = false;
 				break;
-
+			}
 			case CJobQueue::EjqrCompleted:
 				break;
 		}
@@ -496,6 +497,7 @@ CScheduler::Complete(CJob *pj)
 void
 CScheduler::CompleteQueued(CJob *pj)
 {
+	GPOS_ASSERT(false);
 	GPOS_ASSERT(0 == pj->UlpRefs());
 
 #ifdef GPOS_DEBUG