diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index b8a594b9bc5fdf954cb58f398a4b3f8f48f9de23..723cbd68c7f130a6c861445c5fb65ee71465d2b2 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -515,6 +515,8 @@ bool LLEventQueue::post(const LLSD& event)
 
 void LLEventQueue::flush()
 {
+	if(!mEnabled || !mSignal) return;
+		
     // Consider the case when a given listener on this LLEventQueue posts yet
     // another event on the same queue. If we loop over mEventQueue directly,
     // we'll end up processing all those events during the same flush() call