diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java
index fb0313f21f..f1573fa10b 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java
@@ -56,6 +56,7 @@ public class RetainedMessageSubscriptionRecoveryPolicy implements SubscriptionRe
             if (message.getContent().getLength() > 0) {
                 // non zero length message content
                 retainedMessage = message.copy();
+                retainedMessage.getMessage().removeProperty(RETAIN_PROPERTY);
                 retainedMessage.getMessage().setProperty(RETAINED_PROPERTY, true);
             } else {
                 // clear retained message