diff --git a/src/sentinel.c b/src/sentinel.c
index 2711ca304eda..a4db9408eca2 100644
--- a/src/sentinel.c
+++ b/src/sentinel.c
@@ -1461,10 +1461,13 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
     ri->info_refresh = mstime();
     sdsfreesplitres(lines,numlines);
 
-    /* ---------------------------- Acting half ----------------------------- */
-    if (sentinel.tilt) return;
+    /* ---------------------------- Acting half -----------------------------
+     * Some things will not happen if sentinel.tilt is true, but some will
+     * still be processed. */
 
-    /* Act if a master turned into a slave. */
+    /* When what we believe is our master, turned into a slave, the wiser
+     * thing we can do is to follow the events and redirect to the new
+     * master, always. */
     if ((ri->flags & SRI_MASTER) && role == SRI_SLAVE && ri->slave_master_host)
     {
         sentinelEvent(REDIS_WARNING,"+redirect-to-master",ri,
@@ -1473,12 +1476,12 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
             ri->slave_master_host, ri->slave_master_port);
         sentinelResetMasterAndChangeAddress(ri,ri->slave_master_host,
                                                ri->slave_master_port);
-        return;
+        return; /* Don't process anything after this event. */
     }
 
-    /* Act if a slave turned into a master. */
+    /* Handle slave -> master role switch. */
     if ((ri->flags & SRI_SLAVE) && role == SRI_MASTER) {
-        if (ri->flags & SRI_DEMOTE) {
+        if (!sentinel.tilt && ri->flags & SRI_DEMOTE) {
             /* If this sentinel was partitioned from the slave's master,
              * or tilted recently, wait some time before to act,
              * so that DOWN and roles INFO will be refreshed. */
@@ -1513,22 +1516,25 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
                 sentinelEvent(REDIS_NOTICE,"-demote-flag-cleared",ri,"%@");
             }
         } else if (!(ri->master->flags & SRI_FAILOVER_IN_PROGRESS) &&
-            (runid_changed || first_runid))
+                    (runid_changed || first_runid))
         {
             /* If a slave turned into master but:
              *
              * 1) Failover not in progress.
-             * 2) RunID hs changed, or its the first time we see an INFO output.
+             * 2) RunID has changed or its the first time we see an INFO output.
              * 
              * We assume this is a reboot with a wrong configuration.
-             * Log the event and remove the slave. */
+             * Log the event and remove the slave. Note that this is processed
+             * in tilt mode as well, otherwise we lose the information that the
+             * runid changed (reboot?) and when the tilt mode ends a fake
+             * failover will be detected. */
             int retval;
 
             sentinelEvent(REDIS_WARNING,"-slave-restart-as-master",ri,"%@ #removing it from the attached slaves");
             retval = dictDelete(ri->master->slaves,ri->name);
             redisAssert(retval == REDIS_OK);
             return;
-        } else if (ri->flags & SRI_PROMOTED) {
+        } else if (!sentinel.tilt && ri->flags & SRI_PROMOTED) {
             /* If this is a promoted slave we can change state to the
              * failover state machine. */
             if ((ri->master->flags & SRI_FAILOVER_IN_PROGRESS) &&
@@ -1544,11 +1550,12 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
                 sentinelCallClientReconfScript(ri->master,SENTINEL_LEADER,
                     "start",ri->master->addr,ri->addr);
             }
-        } else if (!(ri->master->flags & SRI_FAILOVER_IN_PROGRESS) ||
-                    ((ri->master->flags & SRI_FAILOVER_IN_PROGRESS) &&
-                     (ri->master->flags & SRI_I_AM_THE_LEADER) &&
-                     ri->master->failover_state ==
-                     SENTINEL_FAILOVER_STATE_WAIT_START))
+        } else if (!sentinel.tilt && (
+                    !(ri->master->flags & SRI_FAILOVER_IN_PROGRESS) ||
+                     ((ri->master->flags & SRI_FAILOVER_IN_PROGRESS) &&
+                      (ri->master->flags & SRI_I_AM_THE_LEADER) &&
+                       ri->master->failover_state ==
+                       SENTINEL_FAILOVER_STATE_WAIT_START)))
         {
             /* No failover in progress? Then it is the start of a failover
              * and we are an observer.
@@ -1580,6 +1587,10 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
         }
     }
 
+    /* None of the following conditions are processed when in tilt mode, so
+     * return asap. */
+    if (sentinel.tilt) return;
+
     /* Detect if the slave that is in the process of being reconfigured
      * changed state. */
     if ((ri->flags & SRI_SLAVE) && role == SRI_SLAVE &&