diff --git a/rtos/Thread.cpp b/rtos/Thread.cpp
index da90401f1a..28cda10c3e 100644
--- a/rtos/Thread.cpp
+++ b/rtos/Thread.cpp
@@ -309,9 +309,10 @@ osEvent Thread::signal_wait(int32_t signals, uint32_t millisec) {
                 evt.status = (osStatus)osErrorValue;
                 break;
         }
+    } else {
+        evt.status = (osStatus)osEventSignal;
+        evt.value.signals = res;
     }
-    evt.status = (osStatus)osEventSignal;
-    evt.value.signals = res;
 
     return evt;
 }