diff --git a/html/includes/common/worldmap.inc.php b/html/includes/common/worldmap.inc.php
index 493bd0ab1..0efb6ec40 100644
--- a/html/includes/common/worldmap.inc.php
+++ b/html/includes/common/worldmap.inc.php
@@ -23,7 +23,7 @@
  */
 
 if ($config['map']['engine'] == 'leaflet') {
-    if ((defined('show_settings') || empty($widget_settings)) && $config['front_page'] == "pages/front/tiles.php") {
+    if (defined('show_settings') && $config['front_page'] == "pages/front/tiles.php") {
         $temp_output = '
 <form class="form" onsubmit="widget_settings(this); return false;">
   <div class="form-group">
@@ -77,7 +77,7 @@ if ($config['map']['engine'] == 'leaflet') {
 <div id="leaflet-map"></div>
 <script>
         ';
-        if (!empty($widget_settings)) {
+        if (!empty($widget_settings) && !empty($widget_settings['init_lat']) && !empty($widget_settings['init_lng'])) {
             $init_lat = $widget_settings['init_lat'];
             $init_lng = $widget_settings['init_lng'];
             $init_zoom = $widget_settings['init_zoom'];
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index eb288aed7..ca997512b 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -771,9 +771,9 @@ $config['geoloc']['latlng']                             = false; // True to enab
 $config['geoloc']['engine']                             = 'google';
 $config['map']['engine']                                = 'leaflet';
 $config['mapael']['default_map']                        = 'maps/world_countries.js';
-$config['leaflet']['default_lat']                       = '50.898482';
-$config['leaflet']['default_lng']                       = '-3.401402';
-$config['leaflet']['default_zoom']                       = 2;
+$config['leaflet']['default_lat']                       = '51.4800';
+$config['leaflet']['default_lng']                       = '0';
+$config['leaflet']['default_zoom']                       = 1;
 
 // General GUI options
 $config['gui']['network-map']['style']                  = 'new';//old is also valid