diff --git a/include/task.h b/include/task.h
index de12f429d2..fa53f84d77 100644
--- a/include/task.h
+++ b/include/task.h
@@ -3574,9 +3574,7 @@ TaskHandle_t xTaskGetCurrentTaskHandle( void ) PRIVILEGED_FUNCTION;
 /*
  * Return the handle of the task running on specified core.
  */
-#if ( configNUMBER_OF_CORES > 1 )
-    TaskHandle_t xTaskGetCurrentTaskHandleForCore( BaseType_t xCoreID ) PRIVILEGED_FUNCTION;
-#endif
+TaskHandle_t xTaskGetCurrentTaskHandleForCore( BaseType_t xCoreID ) PRIVILEGED_FUNCTION;
 
 /*
  * Shortcut used by the queue implementation to prevent unnecessary call to
diff --git a/tasks.c b/tasks.c
index 38a80e2de9..037ca2af90 100644
--- a/tasks.c
+++ b/tasks.c
@@ -6559,23 +6559,27 @@ static void prvResetNextTaskUnblockTime( void )
 
             return xReturn;
         }
+    #endif /* #if ( configNUMBER_OF_CORES == 1 ) */
 
-        TaskHandle_t xTaskGetCurrentTaskHandleForCore( BaseType_t xCoreID )
-        {
-            TaskHandle_t xReturn = NULL;
+    TaskHandle_t xTaskGetCurrentTaskHandleForCore( BaseType_t xCoreID )
+    {
+        TaskHandle_t xReturn = NULL;
 
-            traceENTER_xTaskGetCurrentTaskHandleForCore( xCoreID );
+        traceENTER_xTaskGetCurrentTaskHandleForCore( xCoreID );
 
-            if( taskVALID_CORE_ID( xCoreID ) != pdFALSE )
-            {
+        if( taskVALID_CORE_ID( xCoreID ) != pdFALSE )
+        {
+            #if ( configNUMBER_OF_CORES == 1 )
+                xReturn = pxCurrentTCB;
+            #else /* #if ( configNUMBER_OF_CORES == 1 ) */
                 xReturn = pxCurrentTCBs[ xCoreID ];
-            }
+            #endif /* #if ( configNUMBER_OF_CORES == 1 ) */
+        }
 
-            traceRETURN_xTaskGetCurrentTaskHandleForCore( xReturn );
+        traceRETURN_xTaskGetCurrentTaskHandleForCore( xReturn );
 
-            return xReturn;
-        }
-    #endif /* #if ( configNUMBER_OF_CORES == 1 ) */
+        return xReturn;
+    }
 
 #endif /* ( ( INCLUDE_xTaskGetCurrentTaskHandle == 1 ) || ( configUSE_MUTEXES == 1 ) ) */
 /*-----------------------------------------------------------*/