diff --git a/html/pages/graphs.inc.php b/html/pages/graphs.inc.php
index dcef1cb0cb..c802bc011a 100644
--- a/html/pages/graphs.inc.php
+++ b/html/pages/graphs.inc.php
@@ -108,7 +108,7 @@ else {
     echo('</tr></table>');
 
     $graph_array = $vars;
-    $graph_array['height'] = "300";
+    $graph_array['height'] = $config['min_graph_height'];
     $graph_array['width']  = $graph_width;
 
     if($_SESSION['screen_width']) {
@@ -125,7 +125,7 @@ else {
             $graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/2));
         }
         else {
-            $graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5));
+            $graph_array['height'] = max($graph_array['height'],($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5)));
         }
     }
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index c99bfd6f63..5908ae9a23 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -124,6 +124,7 @@ $config['top_ports'] = 1;
 // This enables the top X ports box
 $config['top_devices'] = 1;
 // This enables the top X devices box
+$config['min_graph_height'] = 300;
 $config['page_title_prefix'] = '';
 $config['page_title_suffix'] = $config['project_name'];
 $config['timestamp_format']  = 'd-m-Y H:i:s';