diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp
index 2fdbbf68..daee4b4c 100644
--- a/src/NukiOpenerWrapper.cpp
+++ b/src/NukiOpenerWrapper.cpp
@@ -469,7 +469,7 @@ void NukiOpenerWrapper::updateConfig()
 
 void NukiOpenerWrapper::updateAuthData()
 {
-    if(_nukiOpener.getSecurityPincode() == 0) return;
+    if(!isPinSet()) return;
 
     Nuki::CmdResult result = _nukiOpener.retrieveLogEntries(0, 0, 0, true);
     if(result != Nuki::CmdResult::Success)
@@ -779,7 +779,7 @@ void NukiOpenerWrapper::onConfigUpdateReceived(const char *value)
         return;
     }
 
-    if(_nukiOpener.getSecurityPincode() == 0)
+    if(!isPinSet())
     {
         jsonResult["general"] = "noPinSet";
         serializeJson(jsonResult, _resbuf, sizeof(_resbuf));
@@ -1411,7 +1411,7 @@ void NukiOpenerWrapper::onKeypadCommandReceived(const char *command, const uint
 
 void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
 {
-    if(_nukiOpener.getSecurityPincode() == 0)
+    if(!isPinSet())
     {
         _network->publishKeypadJsonCommandResult("noPinSet");
         return;
@@ -1759,7 +1759,7 @@ void NukiOpenerWrapper::onTimeControlCommandReceived(const char *value)
         return;
     }
 
-    if(_nukiOpener.getSecurityPincode() == 0)
+    if(!isPinSet())
     {
         _network->publishTimeControlCommandResult("noPinSet");
         return;
diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp
index bf126cad..1b28b3ec 100644
--- a/src/NukiWrapper.cpp
+++ b/src/NukiWrapper.cpp
@@ -450,7 +450,7 @@ void NukiWrapper::updateConfig()
 
 void NukiWrapper::updateAuthData()
 {
-    if(_nukiLock.getSecurityPincode() == 0) return;
+    if(!isPinSet()) return;
 
     Nuki::CmdResult result = _nukiLock.retrieveLogEntries(0, 0, 0, true);
     if(result != Nuki::CmdResult::Success)
@@ -715,7 +715,7 @@ void NukiWrapper::onConfigUpdateReceived(const char *value)
         return;
     }
 
-    if(_nukiLock.getSecurityPincode() == 0)
+    if(!isPinSet())
     {
         jsonResult["general"] = "noPinSet";
         serializeJson(jsonResult, _resbuf, sizeof(_resbuf));
@@ -1397,7 +1397,7 @@ void NukiWrapper::onKeypadCommandReceived(const char *command, const uint &id, c
 
 void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
 {
-    if(_nukiLock.getSecurityPincode() == 0)
+    if(!isPinSet())
     {
         _network->publishKeypadJsonCommandResult("noPinSet");
         return;
@@ -1745,7 +1745,7 @@ void NukiWrapper::onTimeControlCommandReceived(const char *value)
         return;
     }
 
-    if(_nukiLock.getSecurityPincode() == 0)
+    if(!isPinSet())
     {
         _network->publishTimeControlCommandResult("noPinSet");
         return;