diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 5822a9cf7..7d967f377 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -1043,7 +1043,8 @@ AnalyzeCommandChain($$;$)
         my $nr =  $devcount++;
         $comments{$nr}{TEXT} = $cmd;
         $comments{$nr}{CFGFN} = $currcfgfile
-            if($currcfgfile ne AttrVal("global", "configfile", ""));
+            if($currcfgfile ne AttrVal("global", "configfile", "") &&
+              !configDBUsed());
       }
     }
     return undef;