diff --git a/src/MqttHandlVedirectHass.cpp b/src/MqttHandlVedirectHass.cpp
index 6a37077c1..e2e8a2497 100644
--- a/src/MqttHandlVedirectHass.cpp
+++ b/src/MqttHandlVedirectHass.cpp
@@ -16,6 +16,9 @@ void MqttHandleVedirectHassClass::init()
 
 void MqttHandleVedirectHassClass::loop()
 {
+    if (!Configuration.get().Vedirect_Enabled) {
+        return;
+    }
     if (_updateForced) {
         publishConfig();
         _updateForced = false;
diff --git a/src/main.cpp b/src/main.cpp
index e3ea23881..2af53c296 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,24 +182,21 @@ void loop()
     yield();
     Hoymiles.loop();
     yield();
+    // Vedirect_Enabled is unknown to lib. Therefor check has to be done here
     if (Configuration.get().Vedirect_Enabled) {
-        VeDirect.loop();
+		VeDirect.loop();
         yield();
-    }
+	}
     MqttHandleDtu.loop();
     yield();
     MqttHandleInverter.loop();
     yield();
-    if (Configuration.get().Vedirect_Enabled) {
-        MqttHandleVedirect.loop();
-        yield();
-    }
+    MqttHandleVedirect.loop();
+    yield();
     MqttHandleHass.loop();
     yield();
-    if (Configuration.get().Vedirect_Enabled) {
-        MqttHandleVedirectHass.loop();
-        yield();
-    }
+    MqttHandleVedirectHass.loop();
+    yield();
     WebApi.loop();
     yield();
     Display.loop();