diff --git a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
index 425e84cbbc..d8ca0bd728 100644
--- a/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
+++ b/modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp
@@ -63,6 +63,9 @@ namespace DirectWriteTypeLayout
         {
             TextLayout* const layout = static_cast<TextLayout*> (clientDrawingContext);
 
+            if (! (baselineOriginY >= -1.0e10f && baselineOriginY <= 1.0e10f))
+                baselineOriginY = 0; // DirectWrite sometimes sends NaNs in this parameter
+
             if (baselineOriginY != lastOriginY)
             {
                 lastOriginY = baselineOriginY;
@@ -74,9 +77,6 @@ namespace DirectWriteTypeLayout
                     TextLayout::Line* const newLine = new TextLayout::Line();
                     layout->addLine (newLine);
 
-                    if (! (baselineOriginY >= 0 || baselineOriginY <= 0))
-                        baselineOriginY = 0; // DirectWrite sometimes sends NaNs in this parameter
-
                     newLine->lineOrigin = Point<float> (baselineOriginX, baselineOriginY);
                 }
             }