diff --git a/django/contrib/gis/templates/gis/kml/placemarks.kml b/django/contrib/gis/templates/gis/kml/placemarks.kml
index 2b9b5e2f02..ea2ac191e5 100644
--- a/django/contrib/gis/templates/gis/kml/placemarks.kml
+++ b/django/contrib/gis/templates/gis/kml/placemarks.kml
@@ -1,8 +1,8 @@
 {% extends "gis/kml/base.kml" %}
 {% block placemarks %}{% for place in places %}
   <Placemark>
-    <name>{{ place.name|escape }}</name>
-    <description>{{ place.description|escape }}</description>
-    {{ place.kml }}
+    <name>{% if place.name %}{{ place.name }}{% else %}{{ place }}{% endif %}</name>
+    <description>{% if place.description %}{{ place.description }}{% else %}{{ place }}{% endif %}</description>
+    {{ place.kml|safe }}
   </Placemark>{% endfor %}{% endblock %}