diff --git a/libraries/libmesosphere/source/kern_k_condition_variable.cpp b/libraries/libmesosphere/source/kern_k_condition_variable.cpp
index ba25f35c4..7e9a4499f 100644
--- a/libraries/libmesosphere/source/kern_k_condition_variable.cpp
+++ b/libraries/libmesosphere/source/kern_k_condition_variable.cpp
@@ -102,14 +102,13 @@ namespace ams::kern {
                 }
             }
             MESOSPHERE_ASSERT(owner_thread.IsNotNull());
-        }
 
-        /* Remove the thread as a waiter from the lock owner. */
-        {
-            KScopedSchedulerLock sl;
-            KThread *owner_thread = cur_thread->GetLockOwner();
-            if (owner_thread != nullptr) {
-                owner_thread->RemoveWaiter(cur_thread);
+            /* Remove the thread as a waiter from the lock owner. */
+            {
+                KScopedSchedulerLock sl;
+                if (KThread *mutex_owner = cur_thread->GetLockOwner(); mutex_owner != nullptr) {
+                    mutex_owner->RemoveWaiter(cur_thread);
+                }
             }
         }
 
@@ -250,11 +249,6 @@ namespace ams::kern {
             }
         }
 
-        /* Cancel the timer wait. */
-        if (timer != nullptr) {
-            timer->CancelTask(cur_thread);
-        }
-
         /* Remove from the condition variable. */
         {
             KScopedSchedulerLock sl;
@@ -269,6 +263,11 @@ namespace ams::kern {
             }
         }
 
+        /* Cancel the timer wait. */
+        if (timer != nullptr) {
+            timer->CancelTask(cur_thread);
+        }
+
         /* Get the result. */
         KSynchronizationObject *dummy;
         return cur_thread->GetWaitResult(std::addressof(dummy));