diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1ce1fef..18552e09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,16 +6,17 @@
 
 ### Added
 
-- Basque language
+- Basque language (#1013)
 
 ### Changed
 
-- Bump Rust to nightly 2022-01-26
+- Bump Rust to nightly 2022-01-26 (#1015)
 
 ### Fixed
 
-- Add explanation of sign-up step at sign-up page when email sign-up mode
-- Add NOT NULL constraint to email_blocklist table fields
+- Add explanation of sign-up step at sign-up page when email sign-up mode (#1012)
+- Add NOT NULL constraint to email_blocklist table fields (#1016)
+- Don't fill empty content when switching rich editor (#1017)
 
 ## [[0.7.1]] - 2022-01-12
 
diff --git a/plume-front/src/editor.rs b/plume-front/src/editor.rs
index 1bb2e934..94bbbb59 100644
--- a/plume-front/src/editor.rs
+++ b/plume-front/src/editor.rs
@@ -397,7 +397,9 @@ fn init_editor() -> Result<(), EditorError> {
             content_val.clone(),
             false,
         )?;
-        content.set_inner_html(&content_val);
+        if !content_val.is_empty() {
+            content.set_inner_html(&content_val);
+        }
 
         // character counter
         let character_counter = Closure::wrap(Box::new(mv!(content => move |_| {