diff --git a/rviz_default_plugins/src/rviz_default_plugins/displays/marker/marker_common.cpp b/rviz_default_plugins/src/rviz_default_plugins/displays/marker/marker_common.cpp
index bf4efbb81..478bb547f 100644
--- a/rviz_default_plugins/src/rviz_default_plugins/displays/marker/marker_common.cpp
+++ b/rviz_default_plugins/src/rviz_default_plugins/displays/marker/marker_common.cpp
@@ -294,6 +294,7 @@ MarkerBasePtr MarkerCommon::createOrGetOldMarker(
   if (it != markers_.end()) {
     marker = it->second;
     markers_with_expiration_.erase(marker);
+    frame_locked_markers_.erase(marker);
     if (message->type != marker->getMessage()->type) {
       markers_.erase(it);
       marker = createMarker(message);