diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
index 4610f5cc..437148c3 100644
--- a/code/espurna/config/arduino.h
+++ b/code/espurna/config/arduino.h
@@ -36,7 +36,7 @@
 
 //#define ENABLE_DHT            1
 //#define ENABLE_DS18B20        1
-#define ENABLE_EMON           1
+//#define ENABLE_EMON           1
 //#define ENABLE_HLW8018        1
 //#define ENABLE_RF             1
 //#define ENABLE_FAUXMO         0
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 3a363b37..477e62c8 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -70,14 +70,14 @@
 // -----------------------------------------------------------------------------
 
 #define OTA_PORT                8266
-#define NOFUSS_SERVER           "http://192.168.1.100"
+#define NOFUSS_SERVER           ""
 #define NOFUSS_INTERVAL         3600000
 
 // -----------------------------------------------------------------------------
 // MQTT
 // -----------------------------------------------------------------------------
 
-#define MQTT_SERVER             "192.168.1.100"
+#define MQTT_SERVER             ""
 #define MQTT_PORT               1883
 #define MQTT_TOPIC              "/test/switch/{identifier}"
 #define MQTT_RETAIN             true
diff --git a/code/espurna/config/sensors.h b/code/espurna/config/sensors.h
index 013b4f1f..1763d4fd 100644
--- a/code/espurna/config/sensors.h
+++ b/code/espurna/config/sensors.h
@@ -44,7 +44,7 @@
 #define EMON_ANALOG_PROVIDER    0
 #define EMON_ADC121_PROVIDER    1
 
-#define EMON_PROVIDER           EMON_ADC121_PROVIDER
+#define EMON_PROVIDER           EMON_ANALOG_PROVIDER
 
 #if EMON_PROVIDER == EMON_ANALOG_PROVIDER
 	#define EMON_CURRENT_PIN        0