diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 52b1a1cf..556bbb75 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3746,7 +3746,6 @@ sub set_migration_caps {
 
 my $fast_plug_option = {
     'name' => 1,
-    'hotplug' => 1,
     'onboot' => 1, 
     'shares' => 1,
     'startup' => 1,
@@ -3790,7 +3789,9 @@ sub vmconfig_hotplug_pending {
     foreach my $opt (@delete) {
 	next if $selection && !$selection->{$opt};
 	eval {
-	    if ($opt eq 'tablet') {
+	    if ($opt eq 'hotplug') {
+		die "skip\n" if ($conf->{hotplug} =~ /memory/);
+	    } elsif ($opt eq 'tablet') {
 		die "skip\n" if !$hotplug_features->{usb};
 		if ($defaults->{tablet}) {
 		    vm_deviceplug($storecfg, $conf, $vmid, $opt);
@@ -3834,7 +3835,9 @@ sub vmconfig_hotplug_pending {
 	next if $selection && !$selection->{$opt};
 	my $value = $conf->{pending}->{$opt};
 	eval {
-	    if ($opt eq 'tablet') {
+	    if ($opt eq 'hotplug') {
+		die "skip\n" if ($value =~ /memory/) || ($value !~ /memory/ && $conf->{hotplug} =~ /memory/);
+	    } elsif ($opt eq 'tablet') {
 		die "skip\n" if !$hotplug_features->{usb};
 		if ($value == 1) {
 		    vm_deviceplug($storecfg, $conf, $vmid, $opt);
diff --git a/changelog.Debian b/changelog.Debian
index 4a7966f0..f8bcbd93 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,6 +1,8 @@
 qemu-server (3.3-15) unstable; urgency=low
 
   * code cleanup: add foreach_dimm sub
+  
+  * hotplug: memory hotplug option is not hotpluggable
 
  -- Proxmox Support Team <support@proxmox.com>  Mon, 09 Feb 2015 07:05:05 +0100