diff --git a/lib/vty.c b/lib/vty.c
index 15cc340eb0..ed8b71ed22 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2890,6 +2890,12 @@ int vty_config_enter(struct vty *vty, bool private_config, bool exclusive,
 		}
 		assert(vty->mgmt_locked_candidate_ds);
 		assert(vty->mgmt_locked_running_ds);
+
+		/*
+		 * As datastores are locked explicitly, we don't need implicit
+		 * commits and should allow pending changes.
+		 */
+		vty->pending_allowed = true;
 	}
 
 	vty->node = CONFIG_NODE;
@@ -2946,6 +2952,8 @@ int vty_config_node_exit(struct vty *vty)
 
 	/* TODO: could we check for un-commited changes here? */
 
+	vty->pending_allowed = false;
+
 	if (vty->mgmt_locked_running_ds)
 		vty_mgmt_unlock_running_inline(vty);