diff --git a/src/GeoNodePy/geonode/maps/models.py b/src/GeoNodePy/geonode/maps/models.py
index 0d1b3ad7555..43cce411ee0 100755
--- a/src/GeoNodePy/geonode/maps/models.py
+++ b/src/GeoNodePy/geonode/maps/models.py
@@ -1167,8 +1167,10 @@ def source_lookup(source):
 
         def layer_config(l):
             cfg = l.layer_config()
-            source = source_lookup(l.source_config())
+            src_cfg = l.source_config();
+            source = source_lookup(src_cfg)
             if source: cfg["source"] = source
+            if src_cfg["ptype"] == "gx_wmssource": cfg["buffer"] = 0
             return cfg
 
         config = {