diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp
index 08e5c9fab..cf196cd1f 100644
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -220,8 +220,6 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const c
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylPumpMod_, DeviceValueType::UINT, FL_(cylPumpMod), DeviceValueUOM::PERCENT);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &valveStatus_, DeviceValueType::BOOL, FL_(valveStatus), DeviceValueUOM::NONE);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &vs1Status_, DeviceValueType::BOOL, FL_(vs1Status), DeviceValueUOM::NONE);
-        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylHeated_, DeviceValueType::BOOL, FL_(cylHeated), DeviceValueUOM::NONE);
-        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &collectorShutdown_, DeviceValueType::BOOL, FL_(collectorShutdown), DeviceValueUOM::NONE);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
                               &collectorMaxTemp_,
                               DeviceValueType::UINT,
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 2735bbbc0..d12829d8a 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -171,7 +171,7 @@ void Mqtt::loop() {
         EMSESP::publish_device_values(EMSdevice::DeviceType::MIXER);
     } else
 
-        if (publish_time_water_ && (currentMillis - last_publish_mixer_ > publish_time_water_)) {
+        if (publish_time_water_ && (currentMillis - last_publish_water_ > publish_time_water_)) {
         last_publish_water_ = (currentMillis / publish_time_water_) * publish_time_water_;
         EMSESP::publish_device_values(EMSdevice::DeviceType::WATER);
     } else
@@ -180,6 +180,7 @@ void Mqtt::loop() {
         last_publish_other_ = (currentMillis / publish_time_other_) * publish_time_other_;
         EMSESP::publish_other_values(); // switch and heatpump
         EMSESP::webSchedulerService.publish();
+        EMSESP::webCustomEntityService.publish();
     } else
 
         if (publish_time_sensor_ && (currentMillis - last_publish_sensor_ > publish_time_sensor_)) {
diff --git a/src/system.cpp b/src/system.cpp
index b193deed2..f2b0efd9e 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1276,6 +1276,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
         node["publish time thermostat"] = settings.publish_time_thermostat;
         node["publish time solar"]      = settings.publish_time_solar;
         node["publish time mixer"]      = settings.publish_time_mixer;
+        node["publish time water"]      = settings.publish_time_water;
         node["publish time other"]      = settings.publish_time_other;
         node["publish time sensor"]     = settings.publish_time_sensor;
         node["publish single"]          = settings.publish_single;
diff --git a/src/version.h b/src/version.h
index 3aeb319d6..bc84578b1 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.3-dev.6a"
+#define EMSESP_APP_VERSION "3.6.3-dev.6b"