diff --git a/classes/AddressFormat.php b/classes/AddressFormat.php
index bf288096f..18cdc91de 100644
--- a/classes/AddressFormat.php
+++ b/classes/AddressFormat.php
@@ -379,7 +379,7 @@ class AddressFormatCore extends ObjectModel
 					$addressText .= (!empty($tmpText)) ? $tmpText.$newLine: '';
 				}
 
-		$addressText = rtrim($addressText, $newLine);
+		$addressText = preg_replace('/'.preg_quote($newLine,'/').'$/i', '', $addressText);
 		$addressText = rtrim($addressText, $separator);
 
 		return $addressText;