diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 86523e006935..97d3bb0379d1 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -3435,6 +3435,15 @@ class ComputeManager(manager.Manager):
     @wrap_instance_fault
     def reboot_instance(self, context, instance, block_device_info,
                         reboot_type):
+        @utils.synchronized(instance.uuid)
+        def do_reboot_instance(context, instance, block_device_info,
+                               reboot_type):
+            self._reboot_instance(context, instance, block_device_info,
+                                  reboot_type)
+        do_reboot_instance(context, instance, block_device_info, reboot_type)
+
+    def _reboot_instance(self, context, instance, block_device_info,
+                         reboot_type):
         """Reboot an instance on this host."""
         # acknowledge the request made it to the manager
         if reboot_type == "SOFT":