diff --git a/src/HwTools.cpp b/src/HwTools.cpp
index 22ba78df..eb3cf446 100644
--- a/src/HwTools.cpp
+++ b/src/HwTools.cpp
@@ -129,15 +129,17 @@ bool HwTools::updateTemperatures() {
                 delay(10);
             }
         } else {
-            sensorApi->requestTemperatures();
+            if(sensorCount > 0) {
+                sensorApi->requestTemperatures();
 
-            for(int x = 0; x < sensorCount; x++) {
-                TempSensorData *data = tempSensors[x];
-                float t = sensorApi->getTempC(data->address);
-                data->lastRead = t;
-                if(t > -85) {
-                    data->changed = data->lastValidRead != t;
-                    data->lastValidRead = t;
+                for(int x = 0; x < sensorCount; x++) {
+                    TempSensorData *data = tempSensors[x];
+                    float t = sensorApi->getTempC(data->address);
+                    data->lastRead = t;
+                    if(t > -85) {
+                        data->changed = data->lastValidRead != t;
+                        data->lastValidRead = t;
+                    }
                 }
             }
         }
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index efd970a2..961489de 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -759,7 +759,6 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = true;
-				gpioConfig->tempSensorPin = 5;
 				gpioConfig->ledPinRed = 13;
 				gpioConfig->ledPinGreen = 14;
 				gpioConfig->ledRgbInverted = true;
@@ -777,7 +776,6 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = true;
-				gpioConfig->tempSensorPin = 5;
 				gpioConfig->ledPinRed = 13;
 				gpioConfig->ledPinGreen = 14;
 				gpioConfig->ledRgbInverted = true;
@@ -787,7 +785,6 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = true;
-				gpioConfig->tempSensorPin = 5;
 				gpioConfig->ledPinRed = 13;
 				gpioConfig->ledPinGreen = 14;
 				gpioConfig->ledRgbInverted = true;
@@ -797,7 +794,6 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->apPin = 4;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = true;
-				gpioConfig->tempSensorPin = 14;
 				gpioConfig->vccMultiplier = 1100;
 				break;
 			case 100: // ESP8266
@@ -810,13 +806,11 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->apPin = 4;
 				gpioConfig->ledPin = 5;
 				gpioConfig->ledInverted = true;
-				gpioConfig->tempSensorPin = 14;
 				break;
 			case 202: // Feather
 				gpioConfig->hanPin = 16;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = false;
-				gpioConfig->tempSensorPin = 14;
 				break;
 			case 203: // DevKitC
 				gpioConfig->hanPin = 16;
@@ -828,7 +822,6 @@ void AmsWebServer::handleSetup() {
 				gpioConfig->apPin = 0;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = false;
-				gpioConfig->tempSensorPin = 14;
 				break;
 		}