diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c
index 82691ed2242..ce6c3585ae2 100644
--- a/dlls/gdi32/bidi.c
+++ b/dlls/gdi32/bidi.c
@@ -425,6 +425,11 @@ BOOL BIDI_Reorder(
         if (done)
         {
             HeapFree(GetProcessHeap(), 0, chartype);
+            if (lpOrder)
+            {
+                for (i = 0; i < uCount; i++)
+                    lpOrder[i] = i;
+            }
             return TRUE;
         }
     }