diff --git a/octoprint_enclosure/static/js/enclosure.js b/octoprint_enclosure/static/js/enclosure.js
index 36c391a..31126bf 100644
--- a/octoprint_enclosure/static/js/enclosure.js
+++ b/octoprint_enclosure/static/js/enclosure.js
@@ -83,6 +83,11 @@ $(function () {
       });
     };
 
+    self.calculateRowSpan = function(index_id){
+      span = self.linkedTemperatureControl(index_id())().length
+      return span == 0 ? 1 : span;
+    };
+
     self.hasAnySensorWithHumidity = function(){
       return_value = false;
       self.rpi_inputs_temperature_sensors().forEach(function (sensor) {
diff --git a/octoprint_enclosure/templates/enclosure_tab.jinja2 b/octoprint_enclosure/templates/enclosure_tab.jinja2
index 323f998..809827c 100644
--- a/octoprint_enclosure/templates/enclosure_tab.jinja2
+++ b/octoprint_enclosure/templates/enclosure_tab.jinja2
@@ -20,8 +20,8 @@
 
             <!-- ko foreach: $root.rpi_inputs_temperature_sensors() -->
             <tr>
-                <th class="temperature_sensor" data-bind="text: label, attr: {title: label, rowspan: $root.linkedTemperatureControl(index_id())().length}"></th>
-                <td class="temperature_actual" data-bind="attr: {rowspan: $root.linkedTemperatureControl(index_id())().length}">
+                <th class="temperature_sensor" data-bind="text: label, attr: {title: label, rowspan: $root.calculateRowSpan(index_id}"></th>
+                <td class="temperature_actual" data-bind="attr: {rowspan: $root.calculateRowSpan(index_id}">
                     <span data-bind="text: temp_sensor_temp, attr: {title: temp_sensor_temp}"> </span>
                     <!-- ko if: (use_fahrenheit())  -->
                     <span class="add-on">&deg;F</span>
@@ -31,7 +31,7 @@
                     <!-- /ko -->
                 </td>
                 <!-- ko if: ($root.humidityCapableSensor(temp_sensor_type()))  -->
-                <td class="humidity_actual" data-bind="attr: {rowspan: $root.linkedTemperatureControl(index_id())().length}">
+                <td class="humidity_actual" data-bind="attr: {rowspan: $root.calculateRowSpan(index_id}">
                     <span data-bind="text: temp_sensor_humidity, attr: {title: temp_sensor_humidity}"> </span>
                     <span class="add-on">%</span>
                 </td>
@@ -39,7 +39,7 @@
 
                 <!-- ko if: ($root.hasAnySensorWithHumidity())  -->
                 <!-- ko ifnot: ($root.humidityCapableSensor(temp_sensor_type()))  -->
-                <td class="humidity_actual" data-bind="attr: {rowspan: $root.linkedTemperatureControl(index_id())().length}">N/A</td>
+                <td class="humidity_actual" data-bind="attr: {rowspan: $root.calculateRowSpan(index_id}">N/A</td>
                 <!-- /ko -->
                 <!-- /ko -->