diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 55ef04ffc..b48c66c37 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -746,12 +746,13 @@ FullO3CPU<Impl>::suspendContext(ThreadID tid)
     deactivateThread(tid);
 
     // If this was the last thread then unschedule the tick event.
-    if (activeThreads.size() == 0)
+    if (activeThreads.size() == 0) {
         unscheduleTickEvent();
+        lastRunningCycle = curCycle();
+        _status = Idle;
+    }
 
     DPRINTF(Quiesce, "Suspending Context\n");
-    lastRunningCycle = curCycle();
-    _status = Idle;
 }
 
 template <class Impl>