diff --git a/ChangeLog b/ChangeLog
index 620cebc24..1ce5029a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2017-11-01  Alexei Podtelezhnikov  <apodtele@gmail.com>
+2017-11-06  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	* src/base/ftobjs.c (FT_Load_Glyph): Relocate condition.
+
+2017-11-06  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
 	* src/smooth/ftgrays.c (gray_set_cell): Fix uninitialized variables.
 
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 510825359..c85d06003 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -982,6 +982,7 @@
 
     /* do we need to render the image or preset the bitmap now? */
     if ( !error                                    &&
+         ( load_flags & FT_LOAD_NO_SCALE ) == 0    &&
          slot->format != FT_GLYPH_FORMAT_BITMAP    &&
          slot->format != FT_GLYPH_FORMAT_COMPOSITE )
     {
@@ -994,7 +995,7 @@
 
       if ( load_flags & FT_LOAD_RENDER )
         error = FT_Render_Glyph( slot, mode );
-      else if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
+      else
         ft_glyphslot_preset_bitmap( slot, mode, NULL );
     }