diff --git a/WifiControlSensor/WebServer.ino b/WifiControlSensor/WebServer.ino
index 0d7382f..5a3fac8 100644
--- a/WifiControlSensor/WebServer.ino
+++ b/WifiControlSensor/WebServer.ino
@@ -5,13 +5,15 @@ void WebHandleRoot() {
   server.send(200, "text/html",
               "<head><meta http-equiv=\"refresh\" content=\"" + String(CONFIG_SAMPLING_PERIODE_MS / 1000) + "\" ></head>"
               "<h1>You are connected to " + String(hostName) + "</h1>"
+#ifdef CONFIG_ENABLE_BMP180
               "<fieldset>"
               "<legend>Sensors</legend>"
               "Temperature " + String(temp, 2) + "C<br/>"
               "Pressure " + String(pressure, 2) + "mB<br/>"
               "</fieldset>"
-              "<fieldset>"
+#endif
 #ifdef CONFIG_WEB_CONTROLLED_GPIO
+              "<fieldset>"
               "<legend>Relay</legend>"
               "<a href=\"/gpio?gpio=" TOSTRING(CONFIG_WEB_CONTROLLED_GPIO) "&amp;value=1\">Relay ON</a><br/>"
               "<a href=\"/gpio?gpio=" TOSTRING(CONFIG_WEB_CONTROLLED_GPIO) "&value=0\">Relay OFF</a><br/>"
@@ -22,7 +24,9 @@ void WebHandleRoot() {
               "<a href=\"/setup\">Enter Setup</a><br/>"
               "<a href=\"/otamode\">Put device in OTA mode</a><br/>"
               "MQTT Status: " + (MqttIsConnected() ? "Connected" : "Disconnected") + "<br/>"
+#ifdef CONFIG_ENABLE_BMP180
               "BMP 180 (Temp+Pression) Status: " + (BMP180IsConnected() ? "Connected" : "Disconnected") + "<br/>"
+#endif
               "Free space: " + ESP.getFreeSketchSpace() + "<br/>"
               "Free heap: " + ESP.getFreeHeap() + "<br/>"
               "</fieldset>"
diff --git a/WifiControlSensor/WifiControlSensor.ino b/WifiControlSensor/WifiControlSensor.ino
index f8f9a91..ca6c48d 100644
--- a/WifiControlSensor/WifiControlSensor.ino
+++ b/WifiControlSensor/WifiControlSensor.ino
@@ -237,6 +237,7 @@ void loop() {
       MqttCheckSubscription();
     delay(CONFIG_WEB_DELAY_MS);
 
+#ifdef CONFIG_ENABLE_BMP180
     nbCycle++;
     if (nbCycle > CONFIG_SAMPLING_PERIODE_MS / CONFIG_WEB_DELAY_MS) {
       if (BMP180IsConnected() && BMP180GetTempAndPressure(temp, pressure) == 0) {
@@ -252,5 +253,6 @@ void loop() {
       nbCycle = 0;
 
     }
+#endif
   }
 }
