diff --git a/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm b/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
index 4e7e9cf06c..4ca26c1107 100644
--- a/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
+++ b/PlainFileStoreContrib/lib/Foswiki/Store/PlainFile.pm
@@ -446,9 +446,10 @@ sub saveTopic {
 
     # Fix TOPICINFO
     my $ti = $meta->get('TOPICINFO');
-    $ti->{version} = $rn;
-    $ti->{date}    = $options->{forcedate} || time;
-    $ti->{author}  = $cUID;
+    $ti->{version}  = $rn;
+    $ti->{date}     = $options->{forcedate} || time;
+    $ti->{author}   = $cUID;
+    $ti->{encoding} = $Foswiki::cfg{Site}{CharSet};
 
     # Create new latest
     my $latest = _latestFile($meta);
@@ -481,6 +482,9 @@ sub saveTopic {
         newmeta  => $meta
     );
 
+    # Remove encoding information
+    delete $ti->{encoding};
+
     return $rn;
 }