diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 79e9b16d394..bfac3df28e1 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -146,9 +146,7 @@ def __init__(self, compute_driver=None, *args, **kwargs):
                                              *args, **kwargs)
 
     def init_host(self):
-        """Initialization for a standalone compute service.
-
-        Reboots instances marked as running in DB if they is not running."""
+        """Initialization for a standalone compute service."""
         self.driver.init_host(host=self.host)
         context = nova.context.get_admin_context()
         instances = self.db.instance_get_all_by_host(context, self.host)
@@ -157,12 +155,13 @@ def init_host(self):
             db_state = instance['state']
             drv_state = self._update_state(context, instance['id'])
 
-            expect_running = db_state == power_state.RUNNING != drv_state
+            expect_running = (db_state == power_state.RUNNING != drv_state)
 
             LOG.debug(_('Current state of %(inst_name)s is %(drv_state)s, '
                         'state in DB is %(db_state)s.'), locals())
 
-            if expect_running and FLAGS.start_guests_on_host_boot:
+            if (expect_running and FLAGS.resume_guests_state_on_host_boot)\
+               or FLAGS.start_guests_on_host_boot:
                 LOG.info(_('Rebooting instance %(inst_name)s after '
                             'nova-compute restart.'), locals())
                 self.reboot_instance(context, instance['id'])
diff --git a/nova/flags.py b/nova/flags.py
index 23ca38b1745..6c7e448add5 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -390,3 +390,5 @@ def _get_my_ip():
 
 DEFINE_bool('start_guests_on_host_boot', False,
             'Whether to restart guests when the host reboots')
+DEFINE_bool('resume_guests_state_on_host_boot', False,
+            'Whether to start guests, that was running before the host reboot')