diff --git a/core/lib/Foswiki/UI/Edit.pm b/core/lib/Foswiki/UI/Edit.pm
index c74cfa0dcf..4395d9c18b 100644
--- a/core/lib/Foswiki/UI/Edit.pm
+++ b/core/lib/Foswiki/UI/Edit.pm
@@ -373,7 +373,9 @@ sub init_edit {
         my $basemeta = Foswiki::Meta->load( $session, $web, $topic );
 
         # No need to check permissions; we are admin if we got here.
-        $topicObject->text( $basemeta->getEmbeddedStoreForm() );
+        my $rawText = $basemeta->getEmbeddedStoreForm();
+        $rawText =~ s/^%META:TOPICINFO{.*?}%$//m;
+        $topicObject->text( $rawText );
         $tmpl =~ s/\(edit\)/\(edit cmd=$adminCmd\)/go if $adminCmd;
     }
     else {