diff --git a/configuration/FreeRTOSConfig.h b/configuration/FreeRTOSConfig.h
index beb049d43..946a317a8 100644
--- a/configuration/FreeRTOSConfig.h
+++ b/configuration/FreeRTOSConfig.h
@@ -71,7 +71,7 @@ normally using a count leading zeros assembly instruction.  Set to 0 to select
 the next task to run using a generic C algorithm that works for all FreeRTOS
 ports.  Not all FreeRTOS ports have this option.  Defaults to 0 if left
 undefined. */
-#define configUSE_PORT_OPTIMISED_TASK_SELECTION     1
+#define configUSE_PORT_OPTIMISED_TASK_SELECTION     0
 
 /* Set configUSE_TICKLESS_IDLE to 1 to use the low power tickless mode.  Set to
 0 to keep the tick interrupt running at all times.  Not all FreeRTOS ports
@@ -327,10 +327,6 @@ or it can simple disable interrupts and sit in a loop to halt all execution
 on the failing line for viewing in a debugger. */
 #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }
 
-
-
-
-
 /******************************************************************************/
 /* Cortex-M MPU specific definitions. *****************************************/
 /******************************************************************************/
diff --git a/portable/template/portmacro.h b/portable/template/portmacro.h
index 1a986f6a0..4438ef462 100644
--- a/portable/template/portmacro.h
+++ b/portable/template/portmacro.h
@@ -55,7 +55,7 @@ typedef unsigned char    UBaseType_t;
 
 /*-----------------------------------------------------------*/
 
-    #define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities )
+    #define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) {uxTopPriority = 0;}while(0)
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */