diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 1a6ce746..9847254b 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3755,6 +3755,7 @@ sub set_migration_caps {
 }
 
 my $fast_plug_option = {
+    'lock' => 1,
     'name' => 1,
     'onboot' => 1, 
     'shares' => 1,
diff --git a/qm b/qm
index 249117c9..b6617230 100755
--- a/qm
+++ b/qm
@@ -198,6 +198,7 @@ __PACKAGE__->register_method ({
 	PVE::QemuServer::lock_config ($vmid, sub {
 	    my $conf = PVE::QemuServer::load_config($vmid);
 	    delete $conf->{lock};
+	    delete $conf->{pending}->{lock} if $conf->{pending}; # just to be sure
 	    PVE::QemuServer::update_config_nolock($vmid, $conf, 1);
 	});