diff --git a/fhem/FHEM/00_MQTT2_CLIENT.pm b/fhem/FHEM/00_MQTT2_CLIENT.pm
index 4fc53f78b..d6d4f599c 100644
--- a/fhem/FHEM/00_MQTT2_CLIENT.pm
+++ b/fhem/FHEM/00_MQTT2_CLIENT.pm
@@ -342,6 +342,7 @@ MQTT2_CLIENT_Read($@)
       $val = "" if(!defined($val));
       my $ac = AttrVal($name, "autocreate", undef) ? "autocreate:":"";
       my $cid = $hash->{clientId};
+      $tp =~ s/:/_/g; # 96608
       Dispatch($hash, "$ac$cid:$tp:$val", undef, !$ac);
 
       my $re = AttrVal($name, "rawEvents", undef);
diff --git a/fhem/FHEM/00_MQTT2_SERVER.pm b/fhem/FHEM/00_MQTT2_SERVER.pm
index 9f4ddd4cb..e2ea1c844 100644
--- a/fhem/FHEM/00_MQTT2_SERVER.pm
+++ b/fhem/FHEM/00_MQTT2_SERVER.pm
@@ -419,6 +419,7 @@ MQTT2_SERVER_doPublish($$$$;$)
 
   my $serverName = $server->{NAME};
   my $cid = $src->{cid};
+  $tp =~ s/:/_/g; # 96608
   if(defined($cid) ||                    # "real" MQTT client
      AttrVal($serverName, "rePublish", undef)) {
     $cid = $src->{NAME} if(!defined($cid));