diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 9ad5a1a02..d096c70b5 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -96,7 +96,7 @@ my $use_log = (($> == 0) || ($> == $web_uid));
 logInit( toFile=>$use_log?DEBUG:NOLOG );
 logSetSignal();
 
-my $interactive = 1;
+my $interactive = -t STDERR; # interactive if we have IO
 my $check = 0;
 my $freshen = 0;
 my $rename = 0;
@@ -144,7 +144,7 @@ if ( ($check + $freshen + $rename + $zoneFix + $migrateEvents + ($version?1:0))
   pod2usage(-exitstatus => -1);
 }
 
-if ($check and ($Config{ZM_CHECK_FOR_UPDATES} or $interactive) ) {
+if ($check) {
   if (!$interactive) {
     Info('Update agent starting at '.strftime('%y/%m/%d %H:%M:%S', localtime() )."\n");
   }
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 4f41ea50e..424c1ef9c 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1095,7 +1095,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
@@ -3138,7 +3138,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 {