diff --git a/fhem/FHEM/00_MQTT2_CLIENT.pm b/fhem/FHEM/00_MQTT2_CLIENT.pm
index 8483b8276..c986829b4 100644
--- a/fhem/FHEM/00_MQTT2_CLIENT.pm
+++ b/fhem/FHEM/00_MQTT2_CLIENT.pm
@@ -654,7 +654,6 @@ MQTT2_CLIENT_getStr($$)
 =begin html
 
 <a id="MQTT2_CLIENT"></a>
-<a name="MQTT2_CLIENT"></a>
 <h3>MQTT2_CLIENT</h3>
 <ul>
   MQTT2_CLIENT is a cleanroom implementation of an MQTT client (which connects
diff --git a/fhem/FHEM/00_MQTT2_SERVER.pm b/fhem/FHEM/00_MQTT2_SERVER.pm
index 294e2cfa1..cf5f72eb2 100644
--- a/fhem/FHEM/00_MQTT2_SERVER.pm
+++ b/fhem/FHEM/00_MQTT2_SERVER.pm
@@ -614,7 +614,6 @@ MQTT2_SERVER_ReadDebug($$)
 =begin html
 
 <a id="MQTT2_SERVER"></a>
-<a name="MQTT2_SERVER"></a>
 <h3>MQTT2_SERVER</h3>
 <ul>
   MQTT2_SERVER is a builtin/cleanroom implementation of an MQTT server using no
diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm
index cfcc75570..0f6ac92a2 100644
--- a/fhem/FHEM/10_MQTT2_DEVICE.pm
+++ b/fhem/FHEM/10_MQTT2_DEVICE.pm
@@ -886,7 +886,6 @@ zigbee2mqtt_devStateIcon255($;$$)
 =begin html
 
 <a id="MQTT2_DEVICE"></a>
-<a name="MQTT2_DEVICE"></a>
 <h3>MQTT2_DEVICE</h3>
 <ul>
   MQTT2_DEVICE is used to represent single devices connected to the
diff --git a/fhem/contrib/commandref_join.pl b/fhem/contrib/commandref_join.pl
index 126084886..6d8d194f6 100755
--- a/fhem/contrib/commandref_join.pl
+++ b/fhem/contrib/commandref_join.pl
@@ -187,6 +187,7 @@ generateModuleCommandref($$;$$)
         $docCount++;
         next if($noWarnings);
         $hasLink = ($l =~ m/<a name="$mod"/) if(!$hasLink);
+        $hasLink = ($l =~ m/<a id="$mod"/) if(!$hasLink);
         foreach $tag (TAGS) {
           if($l =~ m/<$tag ([^>]+)>/i) {
             my $attr = $1;