diff --git a/geonode/geoserver/helpers.py b/geonode/geoserver/helpers.py
index fdff2f85987..f3a9f4d4050 100755
--- a/geonode/geoserver/helpers.py
+++ b/geonode/geoserver/helpers.py
@@ -2009,6 +2009,6 @@ def set_time_dimension(cat, name, workspace, time_presentation, time_presentatio
 
 # main entry point to create a thumbnail - will use implementation
 # defined in settings.THUMBNAIL_GENERATOR (see settings.py)
-def create_gs_thumbnail(instance, overwrite=False):
+def create_gs_thumbnail(instance, overwrite=False, check_bbox=False):
     implementation = import_string(settings.THUMBNAIL_GENERATOR)
-    return implementation(instance, overwrite)
+    return implementation(instance, overwrite, check_bbox)
diff --git a/geonode/geoserver/signals.py b/geonode/geoserver/signals.py
index 9db98eed857..9e9c79d58d7 100644
--- a/geonode/geoserver/signals.py
+++ b/geonode/geoserver/signals.py
@@ -90,6 +90,8 @@ def geoserver_post_save(instance, sender, **kwargs):
         instance_dict = model_to_dict(instance)
         payload = json_serializer_producer(instance_dict)
         producer.geoserver_upload_layer(payload)
+        logger.info("... Creating Thumbnail for Layer [%s]" % (instance.alternate))
+        create_gs_thumbnail(instance, overwrite=True, check_bbox=True)
 
 
 def geoserver_post_save_local(instance, *args, **kwargs):
@@ -508,8 +510,8 @@ def command_url(command):
 
     # some thumbnail generators will update thumbnail_url.  If so, don't
     # immediately re-generate the thumbnail here.  use layer#save(update_fields=['thumbnail_url'])
-    if not ('update_fields' in kwargs and kwargs['update_fields'] is not None and
-            'thumbnail_url' in kwargs['update_fields']):
+    if 'update_fields' in kwargs and kwargs['update_fields'] is not None and \
+            'thumbnail_url' in kwargs['update_fields']:
         logger.info("... Creating Thumbnail for Layer [%s]" % (instance.alternate))
         create_gs_thumbnail(instance, overwrite=True)
 
@@ -632,4 +634,5 @@ def geoserver_pre_save_maplayer(instance, sender, **kwargs):
 
 def geoserver_post_save_map(instance, sender, **kwargs):
     instance.set_missing_info()
-    create_gs_thumbnail(instance, overwrite=False)
+    logger.info("... Creating Thumbnail for Map [%s]" % (instance.title))
+    create_gs_thumbnail(instance, overwrite=False, check_bbox=True)