diff --git a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
index 7cf434dc48..72b305d301 100644
--- a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
+++ b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
@@ -73,6 +73,10 @@ namespace DirectWriteTypeLayout
                     jassert (currentLine == layout->getNumLines());
                     TextLayout::Line* const newLine = new TextLayout::Line();
                     layout->addLine (newLine);
+
+                    if (! std::isnormal (baselineOriginY))
+                        baselineOriginY = 0; // DirectWrite sometimes sends NaNs in this parameter
+
                     newLine->lineOrigin = Point<float> (baselineOriginX, baselineOriginY);
                 }
             }