diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp
index 56b7733..bfa9352 100644
--- a/src/NukiOpenerWrapper.cpp
+++ b/src/NukiOpenerWrapper.cpp
@@ -2672,7 +2672,7 @@ void NukiOpenerWrapper::onKeypadJsonCommandReceived(const char *value)
 
                     if(allowedUntil.length() > 0)
                     {
-                        if(allowedUntil.length() > 0 == 19)
+                        if(allowedUntil.length() == 19)
                         {
                             allowedUntilAr[0] = (uint16_t)allowedUntil.substring(0, 4).toInt();
                             allowedUntilAr[1] = (uint8_t)allowedUntil.substring(5, 7).toInt();
@@ -3478,7 +3478,7 @@ void NukiOpenerWrapper::onAuthCommandReceived(const char *value)
 
                     if(allowedUntil.length() > 0)
                     {
-                        if(allowedUntil.length() > 0 == 19)
+                        if(allowedUntil.length() == 19)
                         {
                             allowedUntilAr[0] = (uint16_t)allowedUntil.substring(0, 4).toInt();
                             allowedUntilAr[1] = (uint8_t)allowedUntil.substring(5, 7).toInt();
diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp
index 8c7e2ef..8888ef7 100644
--- a/src/NukiWrapper.cpp
+++ b/src/NukiWrapper.cpp
@@ -2785,7 +2785,7 @@ void NukiWrapper::onKeypadJsonCommandReceived(const char *value)
 
                     if(allowedUntil.length() > 0)
                     {
-                        if(allowedUntil.length() > 0 == 19)
+                        if(allowedUntil.length() == 19)
                         {
                             allowedUntilAr[0] = (uint16_t)allowedUntil.substring(0, 4).toInt();
                             allowedUntilAr[1] = (uint8_t)allowedUntil.substring(5, 7).toInt();
@@ -3594,7 +3594,7 @@ void NukiWrapper::onAuthCommandReceived(const char *value)
 
                     if(allowedUntil.length() > 0)
                     {
-                        if(allowedUntil.length() > 0 == 19)
+                        if(allowedUntil.length() == 19)
                         {
                             allowedUntilAr[0] = (uint16_t)allowedUntil.substring(0, 4).toInt();
                             allowedUntilAr[1] = (uint8_t)allowedUntil.substring(5, 7).toInt();