diff --git a/src/Presentation/KmlFormatter.php b/src/Presentation/KmlFormatter.php
index 7773e6c30..b8c28fcfe 100644
--- a/src/Presentation/KmlFormatter.php
+++ b/src/Presentation/KmlFormatter.php
@@ -42,10 +42,10 @@ function( Location $location ) {
 
 	private function locationToKmlPlacemark( Location $location ): string {
 		// TODO: escaping?
-		$name = '<name><![CDATA[ ' . $location->getTitle() . ']]></name>';
+		$name = '<name><![CDATA[' . $location->getTitle() . ']]></name>';
 
 		// TODO: escaping?
-		$description = '<description><![CDATA[ ' . $location->getText() . ']]></description>';
+		$description = '<description><![CDATA[' . $location->getText() . ']]></description>';
 
 		$coordinates = '<coordinates>'
 			. $this->escapeValue( $this->getCoordinateString( $location ) )
diff --git a/tests/Unit/Presentation/KmlFormatterTest.php b/tests/Unit/Presentation/KmlFormatterTest.php
index f503269e5..5a7c9b898 100644
--- a/tests/Unit/Presentation/KmlFormatterTest.php
+++ b/tests/Unit/Presentation/KmlFormatterTest.php
@@ -33,15 +33,15 @@ public function testSeveralLocations() {
 <kml xmlns="http://www.opengis.net/kml/2.2">
 	<Document>
 		<Placemark>
-			<name><![CDATA[ first title]]></name>
-			<description><![CDATA[ first text]]></description>
+			<name><![CDATA[first title]]></name>
+			<description><![CDATA[first text]]></description>
 			<Point>
 				<coordinates>23,42.42,0</coordinates>
 			</Point>
 		</Placemark>
 		<Placemark>
-			<name><![CDATA[ second title]]></name>
-			<description><![CDATA[ second text]]></description>
+			<name><![CDATA[second title]]></name>
+			<description><![CDATA[second text]]></description>
 			<Point>
 				<coordinates>0,-1,0</coordinates>
 			</Point>
@@ -63,4 +63,26 @@ public function testSeveralLocations() {
 		);
 	}
 
+	public function testLocationWithoutTitleAndText() {
+		$this->assertSame(
+			'<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2">
+	<Document>
+		<Placemark>
+			<name><![CDATA[]]></name>
+			<description><![CDATA[]]></description>
+			<Point>
+				<coordinates>23,42.42,0</coordinates>
+			</Point>
+		</Placemark>
+	</Document>
+</kml>',
+			( new KmlFormatter() )->formatLocationsAsKml(
+				new Location(
+					new LatLongValue( 42.42,23 )
+				)
+			)
+		);
+	}
+
 }