The present disclosure generally relates to effective key management by properly matching keys used for encryption to data that needs to be decrypted after receiving instructions to change or delete keys. By matching the actual key, rather than just a key index, to a command, each command will use the correct key throughout the entire life-span of the command, even if the key is switched or deleted prior to servicing the command. To implement the key management, a snapshot of the doorbell database is taken. All pending commands that are in the snapshot are then fetched prior to updating a key database with either the change or deletion of the key. After fetching of all pending commands from the snapshot and ensuring the keys are stored in a command context, the key database is updated.