diff --git a/include/FreeRTOS.h b/include/FreeRTOS.h
index 75e2855f7..4a2b9bfc2 100644
--- a/include/FreeRTOS.h
+++ b/include/FreeRTOS.h
@@ -637,7 +637,7 @@ hold explicit before calling the code. */
 #endif
 
 #ifndef traceTASK_NOTIFY_TAKE_BLOCK
-	#define traceTASK_NOTIFY_TAKE_BLOCK()
+	#define traceTASK_NOTIFY_TAKE_BLOCK( uxIndexToWait )
 #endif
 
 #ifndef traceTASK_NOTIFY_TAKE
@@ -645,7 +645,7 @@ hold explicit before calling the code. */
 #endif
 
 #ifndef traceTASK_NOTIFY_WAIT_BLOCK
-	#define traceTASK_NOTIFY_WAIT_BLOCK()
+	#define traceTASK_NOTIFY_WAIT_BLOCK( uxIndexToWait )
 #endif
 
 #ifndef traceTASK_NOTIFY_WAIT
@@ -653,15 +653,15 @@ hold explicit before calling the code. */
 #endif
 
 #ifndef traceTASK_NOTIFY
-	#define traceTASK_NOTIFY()
+	#define traceTASK_NOTIFY( uxIndexToNotify )
 #endif
 
 #ifndef traceTASK_NOTIFY_FROM_ISR
-	#define traceTASK_NOTIFY_FROM_ISR()
+	#define traceTASK_NOTIFY_FROM_ISR( uxIndexToNotify )
 #endif
 
 #ifndef traceTASK_NOTIFY_GIVE_FROM_ISR
-	#define traceTASK_NOTIFY_GIVE_FROM_ISR()
+	#define traceTASK_NOTIFY_GIVE_FROM_ISR( uxIndexToNotify )
 #endif
 
 #ifndef traceSTREAM_BUFFER_CREATE_FAILED
diff --git a/tasks.c b/tasks.c
index 67b7de203..41b976b2f 100644
--- a/tasks.c
+++ b/tasks.c
@@ -4658,7 +4658,7 @@ TickType_t uxReturn;
 				if( xTicksToWait > ( TickType_t ) 0 )
 				{
 					prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );
-					traceTASK_NOTIFY_TAKE_BLOCK();
+					traceTASK_NOTIFY_TAKE_BLOCK( uxIndexToWait );
 
 					/* All ports are written to allow a yield in a critical
 					section (some will yield immediately, others wait until the
@@ -4737,7 +4737,7 @@ TickType_t uxReturn;
 				if( xTicksToWait > ( TickType_t ) 0 )
 				{
 					prvAddCurrentTaskToDelayedList( xTicksToWait, pdTRUE );
-					traceTASK_NOTIFY_WAIT_BLOCK();
+					traceTASK_NOTIFY_WAIT_BLOCK( uxIndexToWait );
 
 					/* All ports are written to allow a yield in a critical
 					section (some will yield immediately, others wait until the
@@ -4862,7 +4862,7 @@ TickType_t uxReturn;
 					break;
 			}
 
-			traceTASK_NOTIFY();
+			traceTASK_NOTIFY( uxIndexToNotify );
 
 			/* If the task is in the blocked state specifically to wait for a
 			notification then unblock it now. */
@@ -5000,7 +5000,7 @@ TickType_t uxReturn;
 					break;
 			}
 
-			traceTASK_NOTIFY_FROM_ISR();
+			traceTASK_NOTIFY_FROM_ISR( uxIndexToNotify );
 
 			/* If the task is in the blocked state specifically to wait for a
 			notification then unblock it now. */
@@ -5089,7 +5089,7 @@ TickType_t uxReturn;
 			semaphore. */
 			( pxTCB->ulNotifiedValue[ uxIndexToNotify ] )++;
 
-			traceTASK_NOTIFY_GIVE_FROM_ISR();
+			traceTASK_NOTIFY_GIVE_FROM_ISR( uxIndexToNotify );
 
 			/* If the task is in the blocked state specifically to wait for a
 			notification then unblock it now. */