diff --git a/mapuvraster.c b/mapuvraster.c
index 7dcfc77d57..1b724396fd 100644
--- a/mapuvraster.c
+++ b/mapuvraster.c
@@ -509,6 +509,8 @@ int msUVRASTERLayerWhichShapes(layerObj *layer, rectObj rect, int isQuery)
   if( CSLFetchNameValue( layer->processing, "UV_SPACING" ) != NULL ) {
     spacing =
       atoi(CSLFetchNameValue( layer->processing, "UV_SPACING" ));
+    if( spacing == 0 )
+        spacing = 32;
   }
 
   width = (int)(layer->map->width/spacing);