diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp
index 4f38548..c969dca 100644
--- a/src/NukiOpenerWrapper.cpp
+++ b/src/NukiOpenerWrapper.cpp
@@ -302,12 +302,6 @@ void NukiOpenerWrapper::update()
              if(cmdResult != Nuki::CmdResult::Success)
              {
                  _network->publishRetry(std::to_string(retryCount + 1));
-
-                 if (esp_task_wdt_status(NULL) == ESP_OK)
-                 {
-                     esp_task_wdt_reset();
-                 }
-
                  ++retryCount;
              }
              postponeBleWatchdog();
@@ -612,12 +606,7 @@ void NukiOpenerWrapper::updateBatteryState()
 
     result = _nukiRetryHandler->retryComm([&]()
     {
-        Nuki::CmdResult cmdResult = _nukiOpener.requestBatteryReport(&_batteryReport);
-        if (esp_task_wdt_status(NULL) == ESP_OK)
-        {
-            esp_task_wdt_reset();
-        }
-        return cmdResult;
+        return _nukiOpener.requestBatteryReport(&_batteryReport);
     });
 
     if(result == Nuki::CmdResult::Success)
@@ -966,12 +955,7 @@ void NukiOpenerWrapper::updateAuth(bool retrieved)
 
         result = _nukiRetryHandler->retryComm([&]()
         {
-            Nuki::CmdResult cmdResult = _nukiOpener.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH));
-            if (esp_task_wdt_status(NULL) == ESP_OK)
-            {
-                esp_task_wdt_reset();
-            }
-            return cmdResult;
+            return _nukiOpener.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH));
         });
 
         if(result == Nuki::CmdResult::Success)
diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp
index 541be62..0598a70 100644
--- a/src/NukiWrapper.cpp
+++ b/src/NukiWrapper.cpp
@@ -324,12 +324,6 @@ void NukiWrapper::update(bool reboot)
              if(cmdResult != Nuki::CmdResult::Success)
              {
                  _network->publishRetry(std::to_string(retryCount + 1));
-
-                 if (esp_task_wdt_status(NULL) == ESP_OK)
-                 {
-                     esp_task_wdt_reset();
-                 }
-
                  ++retryCount;
              }
              postponeBleWatchdog();
@@ -1134,12 +1128,7 @@ void NukiWrapper::updateAuth(bool retrieved)
 
         result = _nukiRetryHandler->retryComm([&]()
         {
-            Nuki::CmdResult cmdResult = _nukiLock.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH));
-            if (esp_task_wdt_status(NULL) == ESP_OK)
-            {
-                esp_task_wdt_reset();
-            }
-            return cmdResult;
+            return _nukiLock.retrieveAuthorizationEntries(0, _preferences->getInt(preference_auth_max_entries, MAX_AUTH));
         });
 
         NukiHelper::printCommandResult(result);
@@ -4010,18 +3999,9 @@ void NukiWrapper::readConfig()
 
     result = _nukiRetryHandler->retryComm([&]()
     {
-        Nuki::CmdResult cmdResult = _nukiLock.requestConfig(&_nukiConfig);
-
-        if(result != Nuki::CmdResult::Success)
-        {
-            if (esp_task_wdt_status(NULL) == ESP_OK)
-            {
-                esp_task_wdt_reset();
-            }
-        }
-
-        return cmdResult;
+        return _nukiLock.requestConfig(&_nukiConfig);
     });
+
     _nukiConfigValid = result == Nuki::CmdResult::Success;
 }
 
@@ -4032,15 +4012,7 @@ void NukiWrapper::readAdvancedConfig()
 
     result = _nukiRetryHandler->retryComm([&]()
     {
-        Nuki::CmdResult cmdResult = _nukiLock.requestAdvancedConfig(&_nukiAdvancedConfig);
-        if(result != Nuki::CmdResult::Success)
-        {
-            if (esp_task_wdt_status(NULL) == ESP_OK)
-            {
-                esp_task_wdt_reset();
-            }
-        }
-        return cmdResult;
+        return _nukiLock.requestAdvancedConfig(&_nukiAdvancedConfig);
     });
     _nukiAdvancedConfigValid = result == Nuki::CmdResult::Success;
 }
diff --git a/src/util/NukiRetryHandler.cpp b/src/util/NukiRetryHandler.cpp
index ed1cc7d..c23115e 100644
--- a/src/util/NukiRetryHandler.cpp
+++ b/src/util/NukiRetryHandler.cpp
@@ -21,6 +21,11 @@ const Nuki::CmdResult NukiRetryHandler::retryComm(std::function<Nuki::CmdResult(
 
     while(retryCount < _nrOfRetries + 1 && cmdResult != Nuki::CmdResult::Success)
     {
+        if (esp_task_wdt_status(NULL) == ESP_OK)
+        {
+            esp_task_wdt_reset();
+        }
+
         cmdResult = func();
 
         if (cmdResult != Nuki::CmdResult::Success)