diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 6bd857c97..04b29f5e1 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -2179,16 +2179,20 @@ CommandDelete($$)
       next;
     }
 
+    $defs{$sdev}->{CL} = $cl;
     my $ret = CallFn($sdev, "UndefFn", $defs{$sdev}, $sdev);
     if($ret) {
       push @rets, $ret;
+      delete $defs{$sdev}->{CL};
       next;
     }
     $ret = CallFn($sdev, "DeleteFn", $defs{$sdev}, $sdev);
     if($ret) {
       push @rets, $ret;
+      delete $defs{$sdev}->{CL};
       next;
     }
+    delete $defs{$sdev}->{CL};
 
 
     # Delete releated hashes