diff --git a/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php b/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
index cd3b572..2e8008f 100644
--- a/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
+++ b/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
@@ -121,10 +121,10 @@ class HighchartsChartsRender implements ChartsRenderInterface {
     $yAxes = [];
     $yAxisTitle = new YaxisTitle();
     $yAxisTitle->setText($options['yaxis_title']);
-    if (!empty($options['yaxis_min'])) {
+    if (is_numeric($options['yaxis_min'])) {
       $chartYaxis->min = $options['yaxis_min'];
     }
-    if (!empty($options['yaxis_max'])) {
+    if (is_numeric($options['yaxis_max'])) {
       $chartYaxis->max = $options['yaxis_max'];
     }
 
@@ -197,6 +197,7 @@ class HighchartsChartsRender implements ChartsRenderInterface {
     $highchart->setChart($chart);
     $highchart->setTitle($chartTitle);
     $highchart->setAxisX($chartXaxis);
+    $highchart->setAxisY($chartYaxis);
     $highchart->setTooltip($chartTooltip);
     $highchart->setPlotOptions($plotOptions);
     $highchart->setCredits($chartCredits);
diff --git a/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php b/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
index 7095ac3..9deb147 100644
--- a/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
+++ b/modules/charts_highcharts/src/Settings/Highcharts/Highcharts.php
@@ -10,13 +10,13 @@ class Highcharts implements \JsonSerializable {
   private $chart;
   private $title;
   private $xAxis;
+  private $yAxis;
   private $tooltip;
   private $plotOptions;
   private $legend;
   private $credits;
   private $innerSize = '%20';
   private $series;
-  /* private $yAxis; */
 
   /**
    * Get Chart.
@@ -78,16 +78,25 @@ class Highcharts implements \JsonSerializable {
     $this->xAxis = $xAxis;
   }
 
-  /*
-  @return mixed
-  public function getYAxis() {
-  return $this->yAxis;
-  }
-  @param mixed $yAxis
-  public function setYAxis($yAxis) {
-  $this->yAxis = $yAxis;
+  /**
+   * Get Y Axis.
+   *
+   * @return \Drupal\charts_highcharts\Settings\Highcharts\Yaxis|null
+   *   Y Axis.
+   */
+  public function getAxisY() {
+    return $this->yAxis;
   }
+
+  /**
+   * Set Y Axis.
+   *
+   * @param \Drupal\charts_highcharts\Settings\Highcharts\Yaxis $yAxis
+   *   Y Axis.
    */
+  public function setAxisY(Yaxis $yAxis) {
+    $this->yAxis = $yAxis;
+  }
 
   /**
    * Get Tooltip.