diff --git a/FHEM/00_MAXLAN.pm b/FHEM/00_MAXLAN.pm
index 7b8780805..caca3c152 100755
--- a/FHEM/00_MAXLAN.pm
+++ b/FHEM/00_MAXLAN.pm
@@ -462,6 +462,9 @@ MAXLAN_Parse($$)
       Log 2, "Got configdata for unimplemented devicetype $devicetype";
     }
 
+    #Clear Error
+    Dispatch($hash, "MAX,Error,$addr", {RAWMSG => $rmsg});
+
     #Check if it is already recorded in devices
     my $found = 0;
     foreach (@{$hash->{devices}}) {
diff --git a/FHEM/10_MAX.pm b/FHEM/10_MAX.pm
index 1a192a025..b5a4d7a14 100755
--- a/FHEM/10_MAX.pm
+++ b/FHEM/10_MAX.pm
@@ -302,7 +302,11 @@ MAX_Parse($$)
     $shash->{windowOpenDuration} = $args[8];
 
   } elsif($msgtype eq "Error") {
-    $shash->{ERROR} = join(",",$args[0]);
+    if(@args == 0) {
+      delete $shash->{ERROR} if(exists($shash->{ERROR}));
+    } else {
+      $shash->{ERROR} = join(",",$args[0]);
+    }
 
   } else {
     Log 1, "MAX_Parse: Unknown message $msgtype";