diff --git a/fhem/CHANGED b/fhem/CHANGED
index 664ac6988..c40b1c30c 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - feature: # comments in fhem.cfg are only removed at the line-start
   - feature: set command modifyTimeSpec for at, to be used in webCmd
   - added:   New module 71_PHILIPS_AUDIO.pm for Philips MCi, Streamium and
              Fidelio devices.
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 473c16ad2..a0192f3a5 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -853,7 +853,7 @@ AnalyzeCommandChain($$;$)
     return undef;
   }
 
-  $cmd =~ s/#.*$//s;
+  $cmd =~ s/^\s*#.*$//s; # Remove comments at the beginning of the line
 
   $cmd =~ s/;;/SeMiCoLoN/g;
   my @saveCmdList = @cmdList;   # Needed for recursive calls