diff --git a/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php b/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
index 0a0e65e..42f1e0f 100644
--- a/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
+++ b/modules/charts_highcharts/src/Charts/HighchartsChartsRender.php
@@ -131,6 +131,21 @@ class HighchartsChartsRender implements ChartsRenderInterface {
 
     $chartYaxis->setLabels($yaxisLabels);
     $chartYaxis->setTitle($yAxisTitle);
+
+    if (isset($options['yaxis_show_first_label'])) {
+      $chartYaxis->showFirstLabel = $options['yaxis_show_first_label'];
+      if ($options['yaxis_show_first_label']) {
+        $chartYaxis->startOnTick = TRUE;
+      }
+    }
+    if (isset($options['yaxis_show_last_label'])) {
+      $chartYaxis->showLastLabel = $options['yaxis_show_last_label'];
+      // endOnTick needs to be TRUE for showLastLabel = TRUE to work.
+      if ($options['yaxis_show_last_label']) {
+        $chartYaxis->endOnTick = TRUE;
+      }
+    }
+
     array_push($yAxes, $chartYaxis);
 
     // Chart libraries tend to support only one secondary axis.