diff --git a/doorlockd/logic.cpp b/doorlockd/logic.cpp
index d710b41..2463516 100644
--- a/doorlockd/logic.cpp
+++ b/doorlockd/logic.cpp
@@ -150,13 +150,14 @@ Logic::Response Logic::_lock()
 Logic::Response Logic::_unlock()
 {
    _door.unlock();
-   _state = UNLOCKED;
    _createNewToken(false);
 
    if (_state == UNLOCKED)
    {
        _logger(LogLevel::warning, "Unable to unlock: already unlocked");
        return AlreadyUnlocked;
+   } else {
+       _state = UNLOCKED;
    }
 
    return Success;