diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index a5fb62e7218..9254ed709df 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -206,9 +206,9 @@ class Odf
 		} 
 		else {
 			$convertedValue = $this->encode_chars($convertedValue, $encode, $charset);
+			$convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $convertedValue);
 		}
 
-		$convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $convertedValue);
 
 		return $convertedValue;
 	}
diff --git a/test/phpunit/ODFTest.php b/test/phpunit/ODFTest.php
index 7c859173326..5bcd9a72290 100644
--- a/test/phpunit/ODFTest.php
+++ b/test/phpunit/ODFTest.php
@@ -342,6 +342,14 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'charset' => null,
 				'expected' => "123 trucmachin &gt; truc &lt; troc &gt; tracbla bla",
 			],
+
+			// HTML should not take \n into account, but only <br />.
+			30 => [
+				'to_convert' => "text with <strong>strong text </strong>, a line\nbreak and <u>underlined</u> words with <i>it@lic sp&ciàlchärs éè l'</i>",
+				'encode' => false,
+				'charset' => 'UTF-8',
+				'expected' => 'text with <text:span text:style-name="boldText">strong text </text:span>, a line'."\n".'break and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>',
+			],
 		];
 
 		$odf=new Odf($filename, array());