diff --git a/SmartSoft_CD_API/smartTaskTriggerObserver.h b/SmartSoft_CD_API/smartTaskTriggerObserver.h
index 5b8cf8c..b032b0e 100644
--- a/SmartSoft_CD_API/smartTaskTriggerObserver.h
+++ b/SmartSoft_CD_API/smartTaskTriggerObserver.h
@@ -103,6 +103,10 @@ class TaskTriggerObserver {
 			if(signalled == false) {
 				trigger_cond_var.wait(lock);
 			}
+			if(trigger_cancelled)
+			{
+				return SMART_CANCELLED;
+			}
 			signalled = false;
 			return SMART_OK;
 		}
@@ -119,6 +123,10 @@ class TaskTriggerObserver {
 					return SMART_TIMEOUT;
 				}
 			}
+			if(trigger_cancelled)
+			{
+				return SMART_CANCELLED;
+			}
 			signalled = false;
 			return SMART_OK;
 		}