diff --git a/maplegend.c b/maplegend.c
index ac83d1aa09..a71da95266 100644
--- a/maplegend.c
+++ b/maplegend.c
@@ -191,7 +191,7 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
   */
 
   /* Scalefactor will be infinity when SIZEUNITS is set in LAYER */
-  if(lp->scalefactor == INFINITY) {
+  if(lp->sizeunits != MS_PIXELS) {
     lp->scalefactor = 1.0; 
   }