diff --git a/changelog.txt b/changelog.txt
index 4a74a094..43f07037 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -30,6 +30,7 @@ FEATURE:	Added justifyTop, justifyMiddle & justifyBottom text justification to G
 FEATURE:	Added justifyWordWrap, justifyNoWordWrap text justification to GDISP (requires GDISP_NEED_TEXT_WORDWRAP)
 FEATURE:	Added justifyPad, justifyNoPad text justification to GDISP
 FEATURE:	Added GDISP_NEED_TEXT_BOXPADLR and GDISP_NEED_TEXT_BOXPADTB configuration options
+FIX:		Fixed an issue on FreeRTOS where thread stacks were being created too large
 
 
 *** Release 2.7 ***
diff --git a/src/gos/gos_freertos.c b/src/gos/gos_freertos.c
index 414b0bab..7c47aa40 100644
--- a/src/gos/gos_freertos.c
+++ b/src/gos/gos_freertos.c
@@ -147,6 +147,9 @@ gfxThreadHandle gfxThreadCreate(void *stackarea, size_t stacksz, threadpriority_
 	gfxThreadHandle task;
 	(void) stackarea;
 
+	// uGFX expresses stack size in bytes - FreeRTOS in "Stack Words"
+	stacksz /= sizeof(StackType_t);
+	
 	if (stacksz < configMINIMAL_STACK_SIZE)
 		stacksz = configMINIMAL_STACK_SIZE;