diff --git a/octoprint/static/js/app/viewmodels/temperature.js b/octoprint/static/js/app/viewmodels/temperature.js
index 7924cd4..1d7b995 100644
--- a/octoprint/static/js/app/viewmodels/temperature.js
+++ b/octoprint/static/js/app/viewmodels/temperature.js
@@ -154,6 +154,10 @@ function TemperatureViewModel(loginStateViewModel, settingsViewModel) {
         self._updateTemperature(self.newTemp(), "temp", function(){self.targetTemp(self.newTemp()); self.newTemp("");});
     };
 
+    self.setTempToZero = function() {
+        self._updateTemperature(0, "temp", function(){self.targetTemp(0); self.newTemp("");});
+    }
+
     self.setBedTempFromProfile = function(profile) {
         self._updateTemperature(profile.bed, "bedTemp");
     }
@@ -162,6 +166,10 @@ function TemperatureViewModel(loginStateViewModel, settingsViewModel) {
         self._updateTemperature(self.newBedTemp(), "bedTemp", function() {self.bedTargetTemp(self.newBedTemp()); self.newBedTemp("");});
     };
 
+    self.setBedTempToZero = function() {
+        self._updateTemperature(0, "bedTemp", function() {self.bedTargetTemp(0); self.newBedTemp("");});
+    }
+
     self._updateTemperature = function(temp, type, callback) {
         var data = {};
         data[type] = temp;
diff --git a/octoprint/templates/index.jinja2 b/octoprint/templates/index.jinja2
index f56a614..1fc1ea1 100644
--- a/octoprint/templates/index.jinja2
+++ b/octoprint/templates/index.jinja2
@@ -275,7 +275,7 @@
                                                 <!-- /ko -->
                                                 <li class="divider"></li>
                                                 <li>
-                                                    <a href="#" data-bind="click: function() { $root.setTemp(0); }">Off</a>
+                                                    <a href="#" data-bind="click: function() { $root.setTempToZero(); }">Off</a>
                                                 </li>
                                             </ul>
                                         </div>
@@ -307,7 +307,7 @@
                                                  <!-- /ko -->
                                                  <li class="divider"></li>
                                                  <li>
-                                                     <a href="#" data-bind="click: function(){ $root.setBedTemp(0); }">Off</a>
+                                                     <a href="#" data-bind="click: function(){ $root.setBedTempToZero(); }">Off</a>
                                                  </li>
                                             </ul>
                                         </div>