diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp
index 3f1f1b5d..807bcc74 100644
--- a/src/NukiOpenerWrapper.cpp
+++ b/src/NukiOpenerWrapper.cpp
@@ -441,7 +441,7 @@ bool NukiOpenerWrapper::isPinSet()
 
 bool NukiOpenerWrapper::isPinValid()
 {
-    return _preferences->getInt(preference_opener_pin_status, (int)NukiPinState::NotConfigured) == 1;
+    return _preferences->getInt(preference_opener_pin_status, (int)NukiPinState::NotConfigured) == (int)NukiPinState::Valid;
 }
 
 void NukiOpenerWrapper::setPin(const uint16_t pin)
diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp
index 62db8b00..d59f6b2f 100644
--- a/src/NukiWrapper.cpp
+++ b/src/NukiWrapper.cpp
@@ -465,7 +465,7 @@ bool NukiWrapper::isPinSet()
 
 bool NukiWrapper::isPinValid()
 {
-    return _preferences->getInt(preference_lock_pin_status, (int)NukiPinState::NotConfigured) == 1;
+    return _preferences->getInt(preference_lock_pin_status, (int)NukiPinState::NotConfigured) == (int)NukiPinState::Valid;
 }
 
 void NukiWrapper::setPin(const uint16_t pin)