diff --git a/include/task.h b/include/task.h
index b3040c643..0805fea2e 100644
--- a/include/task.h
+++ b/include/task.h
@@ -298,12 +298,18 @@ typedef enum
         vTaskPreemptionDisable( NULL );                                                   \
         {                                                                                 \
             const BaseType_t xCoreID = ( BaseType_t ) portGET_CORE_ID();                  \
-            /* Task spinlock is always taken first */                                     \
-            portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxTaskSpinlock );          \
-            /* Disable interrupts */                                                      \
-            portDISABLE_INTERRUPTS();                                                     \
-            /* Take the ISR spinlock next */                                              \
-            portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxISRSpinlock );           \
+            if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0U ) {                       \
+                /* Task spinlock is always taken first */                                 \
+                portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxTaskSpinlock );      \
+                /* Disable interrupts */                                                  \
+                portDISABLE_INTERRUPTS();                                                 \
+                /* Take the ISR spinlock next */                                          \
+                portGET_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxISRSpinlock );       \
+            }                                                                             \
+            else                                                                          \
+            {                                                                             \
+                mtCOVERAGE_TEST_MARKER();                                                 \
+            }                                                                             \
             /* Increment the critical nesting count */                                    \
             portINCREMENT_CRITICAL_NESTING_COUNT( xCoreID );                              \
         }                                                                                 \
@@ -339,27 +345,27 @@ typedef enum
  * \ingroup GranularLocks
  */
 #if ( portUSING_GRANULAR_LOCKS == 1 )
-    #define taskDATA_GROUP_EXIT_CRITICAL( pxTaskSpinlock, pxISRSpinlock )        \
-    do {                                                                         \
-        const BaseType_t xCoreID = ( BaseType_t ) portGET_CORE_ID();             \
-        configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U );          \
-        /* Release the ISR spinlock */                                           \
-        portRELEASE_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxISRSpinlock );  \
-        /* Release the task spinlock */                                          \
-        portRELEASE_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxTaskSpinlock ); \
-        /* Decrement the critical nesting count */                               \
-        portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );                         \
-        /* Enable interrupts only if the critical nesting count is 0 */          \
-        if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 )                     \
-        {                                                                        \
-            portENABLE_INTERRUPTS();                                             \
-        }                                                                        \
-        else                                                                     \
-        {                                                                        \
-            mtCOVERAGE_TEST_MARKER();                                            \
-        }                                                                        \
-        /* Re-enable preemption */                                               \
-        vTaskPreemptionEnable( NULL );                                           \
+    #define taskDATA_GROUP_EXIT_CRITICAL( pxTaskSpinlock, pxISRSpinlock )            \
+    do {                                                                             \
+        const BaseType_t xCoreID = ( BaseType_t ) portGET_CORE_ID();                 \
+        configASSERT( portGET_CRITICAL_NESTING_COUNT( xCoreID ) > 0U );              \
+        /* Decrement the critical nesting count */                                   \
+        portDECREMENT_CRITICAL_NESTING_COUNT( xCoreID );                             \
+        if( portGET_CRITICAL_NESTING_COUNT( xCoreID ) == 0 )                         \
+        {                                                                            \
+            /* Release the ISR spinlock */                                           \
+            portRELEASE_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxISRSpinlock );  \
+            /* Enable interrupts */                                                  \
+            portENABLE_INTERRUPTS();                                                 \
+            /* Release the task spinlock */                                          \
+            portRELEASE_SPINLOCK( xCoreID, ( portSPINLOCK_TYPE * ) pxTaskSpinlock ); \
+        }                                                                            \
+        else                                                                         \
+        {                                                                            \
+            mtCOVERAGE_TEST_MARKER();                                                \
+        }                                                                            \
+        /* Re-enable preemption */                                                   \
+        vTaskPreemptionEnable( NULL );                                               \
     } while( 0 )
 #endif /* #if ( portUSING_GRANULAR_LOCKS == 1 ) */