diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4feea00fe..958410efe 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1077,7 +1077,7 @@ bool Monitor::connect() {
   //ONVIF Setup
 #ifdef WITH_GSOAP
   ONVIF_Trigger_State = FALSE;
-  if (onvif_event_listener) { //Temporarily using this option to enable the feature
+  if (onvif_event_listener) {
     Debug(1, "Starting ONVIF");
     ONVIF_Healthy = FALSE;
     if (onvif_options.find("closes_event") != std::string::npos) { //Option to indicate that ONVIF will send a close event message
@@ -3130,7 +3130,7 @@ int Monitor::PrimeCapture() {
 
 #ifdef WITH_GSOAP //For now, just don't run the thread if no ONVIF support. This may change if we add other long polling options.
   //ONVIF Thread
-  if (onvif_event_listener) {
+  if (onvif_event_listener  && ONVIF_Healthy) {
     if (!Poller) {
       Poller = zm::make_unique<PollThread>(this);
     } else {