diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp
index 908062a5b..189ab7ed0 100644
--- a/src/modules/Telemetry/EnvironmentTelemetry.cpp
+++ b/src/modules/Telemetry/EnvironmentTelemetry.cpp
@@ -181,6 +181,8 @@ void EnvironmentTelemetryModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiSt
         display->drawString(x, y += fontHeight(FONT_SMALL),
                             "Volt/Cur: " + String(lastMeasurement.variant.environment_metrics.voltage, 0) + "V / " +
                                 String(lastMeasurement.variant.environment_metrics.current, 0) + "mA");
+    if (lastMeasurement.variant.environment_metrics.iaq != 0)
+        display->drawString(x, y += fontHeight(FONT_SMALL), "IAQ: " + String(lastMeasurement.variant.environment_metrics.iaq));
 }
 
 bool EnvironmentTelemetryModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_Telemetry *t)
diff --git a/src/modules/Telemetry/Sensor/BME680Sensor.cpp b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
index 323dce31f..e1222bba4 100644
--- a/src/modules/Telemetry/Sensor/BME680Sensor.cpp
+++ b/src/modules/Telemetry/Sensor/BME680Sensor.cpp
@@ -57,6 +57,7 @@ bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
     measurement->variant.environment_metrics.barometric_pressure = bme680.getData(BSEC_OUTPUT_RAW_PRESSURE).signal / 100.0F;
     measurement->variant.environment_metrics.gas_resistance = bme680.getData(BSEC_OUTPUT_RAW_GAS).signal / 1000.0;
     // Check if we need to save state to filesystem (every STATE_SAVE_PERIOD ms)
+    measurement->variant.environment_metrics.iaq = bme680.getData(BSEC_OUTPUT_IAQ).signal;
     updateState();
     return true;
 }
@@ -85,17 +86,17 @@ void BME680Sensor::updateState()
     if (stateUpdateCounter == 0) {
         /* First state update when IAQ accuracy is >= 3 */
         accuracy = bme680.getData(BSEC_OUTPUT_IAQ).accuracy;
-        if (accuracy >= 3) {
-            LOG_DEBUG("%s state update IAQ accuracy %u >= 3\n", sensorName, accuracy);
+        if (accuracy >= 2) {
+            LOG_DEBUG("%s state update IAQ accuracy %u >= 2\n", sensorName, accuracy);
             update = true;
             stateUpdateCounter++;
         } else {
-            LOG_DEBUG("%s not updated, IAQ accuracy is %u >= 3\n", sensorName, accuracy);
+            LOG_DEBUG("%s not updated, IAQ accuracy is %u < 2\n", sensorName, accuracy);
         }
     } else {
         /* Update every STATE_SAVE_PERIOD minutes */
         if ((stateUpdateCounter * STATE_SAVE_PERIOD) < millis()) {
-            LOG_DEBUG("%s state update every %d minutes\n", sensorName, STATE_SAVE_PERIOD);
+            LOG_DEBUG("%s state update every %d minutes\n", sensorName, STATE_SAVE_PERIOD / 60000);
             update = true;
             stateUpdateCounter++;
         }
@@ -103,22 +104,15 @@ void BME680Sensor::updateState()
 
     if (update) {
         bme680.getState(bsecState);
-        std::string filenameTmp = bsecConfigFileName;
-        filenameTmp += ".tmp";
+        if (FSCom.exists(bsecConfigFileName) && !FSCom.remove(bsecConfigFileName)) {
+            LOG_WARN("Can't remove old state file\n");
+        }
         auto file = FSCom.open(bsecConfigFileName, FILE_O_WRITE);
         if (file) {
             LOG_INFO("%s state write to %s.\n", sensorName, bsecConfigFileName);
             file.write((uint8_t *)&bsecState, BSEC_MAX_STATE_BLOB_SIZE);
             file.flush();
             file.close();
-            // brief window of risk here ;-)
-            if (FSCom.exists(bsecConfigFileName) && !FSCom.remove(bsecConfigFileName)) {
-                LOG_WARN("Can't remove old state file\n");
-            }
-            if (!renameFile(filenameTmp.c_str(), bsecConfigFileName)) {
-                LOG_ERROR("Error: can't rename new state file\n");
-            }
-
         } else {
             LOG_INFO("Can't write %s state (File: %s).\n", sensorName, bsecConfigFileName);
         }