diff --git a/fhem/FHEM/32_SYSSTAT.pm b/fhem/FHEM/32_SYSSTAT.pm
index ea41f54f4..9bfb1478a 100644
--- a/fhem/FHEM/32_SYSSTAT.pm
+++ b/fhem/FHEM/32_SYSSTAT.pm
@@ -139,10 +139,15 @@ SYSSTAT_Connect($)
     RemoveInternalTimer($hash);
     InternalTimer(gettimeofday()+5, "SYSSTAT_GetUpdate", $hash, 0);
 
+    return;
+
+  } elsif( AttrVal($name, "noSSH", undef ) ) {
+    RemoveInternalTimer($hash);
+    InternalTimer(gettimeofday()+5, "SYSSTAT_GetUpdate", $hash, 0);
+
     return;
   }
 
-  return undef if( AttrVal($name, "noSSH", undef ) );
   return undef if( AttrVal($name, "disable", undef ) );
 
   my @queue = ();
@@ -910,8 +915,8 @@ SYSSTAT_GetUpdate($)
   if( AttrVal($name, "noSSH", undef) ) {
     my @queue = ();
     $hash->{QUEUE} = \@queue;
-  
-  } elsif( !AttrVal($name, "noSSH", undef) && $hash->{QUEUE} && scalar @{$hash->{QUEUE}} ) {
+
+  } elsif( $hash->{QUEUE} && scalar @{$hash->{QUEUE}} ) {
     Log3 $name, 2, "$name: unanswered query in queue, reconnecting";
     SYSSTAT_Connect($hash);
     return;
@@ -984,6 +989,10 @@ SYSSTAT_GetUpdateSNMP($)
     return undef;
   }
 
+  if(!$hash->{LOCAL}) {
+    return if( IsDisabled($name) > 0 );
+  }
+
   SYSSTAT_getLoadAVGSNMP($hash);
 
   SYSSTAT_getFilesystemsSNMP($hash) if( $hash->{do_diskusage} && $#{$hash->{filesystems}} >= 0 );