diff --git a/src/core/symbology-ng/qgsfillsymbollayer.cpp b/src/core/symbology-ng/qgsfillsymbollayer.cpp
index cc63c7e4251..0baa7acb0c8 100644
--- a/src/core/symbology-ng/qgsfillsymbollayer.cpp
+++ b/src/core/symbology-ng/qgsfillsymbollayer.cpp
@@ -2654,7 +2654,8 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolRenderContext&
   width += 2 * xBuffer;
   height += 2 * yBuffer;
 
-  if ( width > 10000 || height > 10000 ) //protect symbol layer from eating too much memory
+  //protect from zero width/height image and symbol layer from eating too much memory
+  if ( width > 10000 || height > 10000 || width == 0 || height == 0 )
   {
     return;
   }