diff --git a/html/includes/common/availability-map.inc.php b/html/includes/common/availability-map.inc.php
index 02b80a0b0..2fc72a090 100644
--- a/html/includes/common/availability-map.inc.php
+++ b/html/includes/common/availability-map.inc.php
@@ -32,7 +32,7 @@ if (defined('show_settings')) {
 else {
 
     require_once 'includes/object-cache.inc.php';
-    $tile_width = $widget_settings['tile_width'];
+    $tile_width = $widget_settings['tile_width']?:$config['availability-map-width'];
 
     $sql = 'SELECT `D`.`hostname`,`D`.`device_id`,`D`.`status`,`D`.`uptime` FROM `devices` AS `D`';
 
@@ -65,7 +65,7 @@ else {
         $temp_output[] = '<a href="' . generate_url(array(
             'page' => 'device',
             'device' => $device['device_id']
-        )) . '" role="button" class="btn ' . $btn_type . ' btn-xs" title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '" style="min-height:' . $tile_width . 'px; min-width: ' . $tile_width . 'px; border-radius:0px; margin:0; padding:0;"></a>';
+        )) . '" role="button" class="btn ' . $btn_type . ' btn-xs" title="' . $device['hostname'] . " - " . formatUptime($device['uptime']) . '" style="min-height:' . $tile_width . 'px; min-width: ' . $tile_width . 'px; border-radius:0px; margin:0px; padding:0px;"></a>';
     }
 
     $temp_rows = count($temp_output);
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 21057ea49..6b354842f 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -783,3 +783,6 @@ $config['navbar']['manage_groups']['hide']              = 0;
 
 // Show errored ports in the summary table on the dashboard
 $config['summary_errors']                               = 0;
+
+// Default width of the availability map's tiles
+$config['availability-map-width']                       = 20;