Fix: queries were enqueued more than once because lock wasn't saved