diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm
index 37f274a61..9cd2f150d 100644
--- a/fhem/FHEM/10_MQTT2_DEVICE.pm
+++ b/fhem/FHEM/10_MQTT2_DEVICE.pm
@@ -495,7 +495,8 @@ MQTT2_DEVICE_Rename($$)
   my ($new, $old) = @_;
   MQTT2_DEVICE_delReading($old);
   MQTT2_DEVICE_addReading($new, AttrVal($new, "readingList", ""));
-  $defs{$new}{DEVICETOPIC} = $new;
+  $defs{$new}{DEVICETOPIC} = $new
+    if($defs{$new}{DEVICETOPIC} eq $old && !AttrVal($new,"devicetopic",undef));
   return undef;
 }