diff --git a/src/app_state.rs b/src/app_state.rs
index fb4b92e7..432a9a27 100644
--- a/src/app_state.rs
+++ b/src/app_state.rs
@@ -228,8 +228,12 @@ impl AppState {
 
             writer.execute(Clear(ClearType::All))?;
             writer.write_all(FENISH_LINE.as_bytes())?;
-            writer.write_all(self.final_message.as_bytes())?;
-            writer.write_all(b"\n")?;
+
+            let final_message = self.final_message.trim();
+            if !final_message.is_empty() {
+                writer.write_all(self.final_message.as_bytes())?;
+                writer.write_all(b"\n")?;
+            }
 
             return Ok(ExercisesProgress::AllDone);
         };