diff --git a/src/MqttHandleInverterTotal.cpp b/src/MqttHandleInverterTotal.cpp
index f2deba1d..ac8e6a4e 100644
--- a/src/MqttHandleInverterTotal.cpp
+++ b/src/MqttHandleInverterTotal.cpp
@@ -7,7 +7,6 @@
 #include "Datastore.h"
 #include "MqttSettings.h"
 #include <Hoymiles.h>
-#include "WebApi_database.h"
 
 MqttHandleInverterTotalClass MqttHandleInverterTotal;
 
@@ -32,6 +31,5 @@ void MqttHandleInverterTotalClass::loop()
         MqttSettings.publish("dc/is_valid", String(Datastore.getIsAllEnabledReachable()));
 
         _lastPublish.set(Configuration.get().Mqtt_PublishInterval * 1000);
-
     }
 }
diff --git a/src/WebApi_database.cpp b/src/WebApi_database.cpp
index 5dd0a0e5..6695a1d5 100644
--- a/src/WebApi_database.cpp
+++ b/src/WebApi_database.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "WebApi_database.h"
+#include "Datastore.h"
 #include "MessageOutput.h"
 #include "WebApi.h"
 #include "defaults.h"
@@ -20,6 +21,10 @@ void WebApiDatabaseClass::init(AsyncWebServer* server)
 
 void WebApiDatabaseClass::loop()
 {
+    if (!Hoymiles.isAllRadioIdle()) {
+        return;
+    }
+    write(Datastore.getTotalAcYieldTotalEnabled()); // write value to database
 }
 
 bool WebApiDatabaseClass::write(float energy)
@@ -42,10 +47,10 @@ bool WebApiDatabaseClass::write(float energy)
         old_hour = timeinfo.tm_hour;
         return (false);
     }
-    MessageOutput.println("Next hour.");
+    // MessageOutput.println("Next hour.");
     if (energy <= old_energy) // enery must have increased
         return (false);
-    MessageOutput.println("Energy difference > 0");
+    // MessageOutput.println("Energy difference > 0");
 
     struct Data d;
     d.tm_hour = old_hour;
@@ -56,13 +61,13 @@ bool WebApiDatabaseClass::write(float energy)
     d.energy = old_energy = energy;
 
     // create database file if it does not exist
-    if (!LittleFS.exists(DATABASE_FILENAME)) {
-        MessageOutput.println("Database file does not exist.");
-        File f = LittleFS.open(DATABASE_FILENAME, "w", true);
-        f.flush();
-        f.close();
-        MessageOutput.println("New database file created.");
-    }
+    // if (!LittleFS.exists(DATABASE_FILENAME)) {
+    //    MessageOutput.println("Database file does not exist.");
+    //    File f = LittleFS.open(DATABASE_FILENAME, "w", true);
+    //    f.flush();
+    //    f.close();
+    //    MessageOutput.println("New database file created.");
+    //}
 
     File f = LittleFS.open(DATABASE_FILENAME, "a", true);
     if (!f) {
diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
index 4ee9604b..74db2bea 100644
--- a/src/WebApi_ws_live.cpp
+++ b/src/WebApi_ws_live.cpp
@@ -10,8 +10,6 @@
 #include "defaults.h"
 #include <AsyncJson.h>
 
-WebApiDatabaseClass database;
-
 WebApiWsLiveClass::WebApiWsLiveClass()
     : _ws("/livedata")
 {
@@ -166,8 +164,6 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
     addTotalField(totalObj, "YieldDay", Datastore.getTotalAcYieldDayEnabled(), "Wh", Datastore.getTotalAcYieldDayDigits());
     addTotalField(totalObj, "YieldTotal", Datastore.getTotalAcYieldTotalEnabled(), "kWh", Datastore.getTotalAcYieldTotalDigits());
 
-    database.write(Datastore.getTotalAcYieldTotalEnabled());      // write value to database
-
     JsonObject hintObj = root.createNestedObject("hints");
     struct tm timeinfo;
     hintObj["time_sync"] = !getLocalTime(&timeinfo, 5);