diff --git a/fhem/FHEM/90_at.pm b/fhem/FHEM/90_at.pm
index cbb2c6685..d31d91780 100755
--- a/fhem/FHEM/90_at.pm
+++ b/fhem/FHEM/90_at.pm
@@ -93,7 +93,7 @@ at_Exec($)
   my ($name) = @_;
   my ($skip, $disable);
 
-  return if(!$defs{$name}{DEF});           # Just deleted
+  return if(!$defs{$name});           # Just deleted
 
   if(defined($attr{$name})) {
     $skip    = 1 if($attr{$name} && $attr{$name}{skip_next});
@@ -105,6 +105,8 @@ at_Exec($)
   $command = SemicolonEscape($command);
   AnalyzeCommandChain(undef, $command) if(!$skip && !$disable);
 
+  return if(!$defs{$name});           # Deleted in the Command
+
   my $count = $defs{$name}{REP};
   my $def = $defs{$name}{DEF};