diff --git a/components/freertos/queue.c b/components/freertos/queue.c
index 4be568928c..356c93e323 100644
--- a/components/freertos/queue.c
+++ b/components/freertos/queue.c
@@ -770,6 +770,11 @@ Queue_t * const pxQueue = xQueue;
 	}
 	#endif
 
+#if ( configUSE_MUTEXES == 1 && configCHECK_MUTEX_GIVEN_BY_OWNER == 1)
+	configASSERT(pxQueue->uxQueueType != queueQUEUE_IS_MUTEX
+				 || pxQueue->u.xSemaphore.xMutexHolder == NULL
+				 || pxQueue->u.xSemaphore.xMutexHolder == xTaskGetCurrentTaskHandle());
+#endif
 
 	/*lint -save -e904 This function relaxes the coding standard somewhat to
 	allow return statements within the function itself.  This is done in the