Fix: queries were enqueued >1 because lock wasn't saved