diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 7d646807e7..4694e1bb0f 100644
--- a/win32ss/gdi/ntgdi/freetype.c
+++ b/win32ss/gdi/ntgdi/freetype.c
@@ -4203,6 +4203,16 @@ ftGdiGetGlyphOutline(
     }
 
     DPRINT("ftGdiGetGlyphOutline END and needed %lu\n", needed);
+
+    if (needed == 0)
+    {
+        /* workaround for CORE-15949 */
+        if (gm.gmBlackBoxX == 0)
+            gm.gmBlackBoxX = 1;
+        if (gm.gmBlackBoxY == 0)
+            gm.gmBlackBoxY = 1;
+    }
+
     *pgm = gm;
     return needed;
 }