diff --git a/src/backoffice/templates/facility_detail_backoffice.html b/src/backoffice/templates/facility_detail_backoffice.html
index 45bbd5e8..34f6e3b7 100644
--- a/src/backoffice/templates/facility_detail_backoffice.html
+++ b/src/backoffice/templates/facility_detail_backoffice.html
@@ -38,7 +38,7 @@
         </tr>
         <tr>
           <th>Description</th>
-          <td>{{ facility.description }}</td>
+          <td>{{ facility.description|linebreaksbr }}</td>
         </tr>
         <tr>
           <th>Opening Hours</th>
@@ -125,7 +125,7 @@
 function MapReadyCallback() {
     // add a marker for this facility
     var marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}})
-    marker.bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description}}</p>").addTo(this);
+    marker.bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description|linebreaksbr }}</p>").addTo(this);
     // max zoom since we have only one marker
     this.setView(marker.getLatLng(), 13);
 };
diff --git a/src/backoffice/templates/facility_list_backoffice.html b/src/backoffice/templates/facility_list_backoffice.html
index 6ceea5df..3dd7da44 100644
--- a/src/backoffice/templates/facility_list_backoffice.html
+++ b/src/backoffice/templates/facility_list_backoffice.html
@@ -43,7 +43,7 @@ Facilities | BackOffice | {{ block.super }}
         <td>{{ facility.name }}</td>
         <td><i class="fas fa-{{ facility.facility_type.icon }} fa-2x fa-fw"></i> {{ facility.facility_type.name }}</td>
         <td>{{ facility.team.name }} Team</td>
-        <td>{{ facility.description|default:"N/A" }}</td>
+        <td>{{ facility.description|linebreaksbr|default:"N/A" }}</td>
         <td>{{ facility.location }}</td>
         <td class="text-center"><span class="badge">{{ facility.feedbacks.count }}</span> / <span class="badge">{{ facility.unhandled_feedbacks.count }}</span></td>
         <td>
@@ -69,7 +69,7 @@ function MapReadyCallback() {
     var markers = new Array();
     {% for facility in facility_list %}
     {% url "backoffice:facility_detail" camp_slug=facility.camp.slug facility_uuid=facility.uuid as detail %}
-    marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}}).bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ detail }}' class='btn btn-primary' style='color: white;'><i class='fas fa-search'></i> Details</a></p>{% endif %}").addTo(this);
+    marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}}).bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description|linebreaksbr }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ detail }}' class='btn btn-primary' style='color: white;'><i class='fas fa-search'></i> Details</a></p>{% endif %}").addTo(this);
     markers.push(marker.getLatLng());
 {% endfor %}
     var markerBounds = L.latLngBounds(markers);
diff --git a/src/facilities/templates/facility_detail.html b/src/facilities/templates/facility_detail.html
index d783fd0d..7ae66074 100644
--- a/src/facilities/templates/facility_detail.html
+++ b/src/facilities/templates/facility_detail.html
@@ -33,7 +33,7 @@
         </tr>
         <tr>
           <th>Description</th>
-          <td>{{ facility.description }}</td>
+          <td>{{ facility.description|linebreaksbr }}</td>
         </tr>
         <tr>
           <th>Location</th>
@@ -85,7 +85,7 @@ function MapReadyCallback() {
     // add a marker for this facility
     {% url "facilities:facility_feedback" camp_slug=facility.camp.slug facility_type_slug=facility.facility_type.slug facility_uuid=facility.uuid as feedback %}
     var marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}})
-    marker.bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ feedback }}' class='btn btn-primary' style='color: white;'><i class='fas fa-comment-dots'></i> Feedback</a></p>{% endif %}").addTo(this);
+    marker.bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description|linebreaksbr }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ feedback }}' class='btn btn-primary' style='color: white;'><i class='fas fa-comment-dots'></i> Feedback</a></p>{% endif %}").addTo(this);
     // max zoom since we have only one marker
     this.setView(marker.getLatLng(), 13);
 };
diff --git a/src/facilities/templates/facility_list.html b/src/facilities/templates/facility_list.html
index 997026ed..2418a4d4 100644
--- a/src/facilities/templates/facility_list.html
+++ b/src/facilities/templates/facility_list.html
@@ -45,7 +45,6 @@ Facilities of type {{ facilitytype }} | {{ block.super }}
     <a href="{% url "facilities:facility_type_list" camp_slug=camp.slug %}" class="btn btn-default"><i class="fas fa-undo"></i> Back to facility type list</a>
   </div>
 </div>
-
 <script type="text/javascript">
 function MapReadyCallback() {
     // loop over facilities and add a marker for each,
@@ -54,7 +53,7 @@ function MapReadyCallback() {
     {% for facility in facility_list %}
     {% url "facilities:facility_detail" camp_slug=facility.camp.slug facility_type_slug=facility.facility_type.slug facility_uuid=facility.uuid as detail %}
     {% url "facilities:facility_feedback" camp_slug=facility.camp.slug facility_type_slug=facility.facility_type.slug facility_uuid=facility.uuid as feedback %}
-    marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}}).bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ detail }}' class='btn btn-primary' style='color: white;'><i class='fas fa-search'></i> Details</a><a href='{{ feedback }}' class='btn btn-primary' style='color: white;'><i class='fas fa-comment-dots'></i> Feedback</a></p>{% endif %}").addTo(this);
+    marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}}).bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description|linebreaksbr }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ detail }}' class='btn btn-primary' style='color: white;'><i class='fas fa-search'></i> Details</a><a href='{{ feedback }}' class='btn btn-primary' style='color: white;'><i class='fas fa-comment-dots'></i> Feedback</a></p>{% endif %}").addTo(this);
     markers.push(marker.getLatLng());
 {% endfor %}
     var markerBounds = L.latLngBounds(markers);
diff --git a/src/facilities/templates/facility_type_list.html b/src/facilities/templates/facility_type_list.html
index b3081aaa..7f85b0f2 100644
--- a/src/facilities/templates/facility_type_list.html
+++ b/src/facilities/templates/facility_type_list.html
@@ -46,7 +46,7 @@ function MapReadyCallback() {
     {% for facility in ft.facilities.all %}
     {% url "facilities:facility_detail" camp_slug=facility.camp.slug facility_type_slug=facility.facility_type.slug facility_uuid=facility.uuid as detail %}
     {% url "facilities:facility_feedback" camp_slug=facility.camp.slug facility_type_slug=facility.facility_type.slug facility_uuid=facility.uuid as feedback %}
-    marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}}).bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ detail }}' class='btn btn-primary' style='color: white;'><i class='fas fa-search'></i> Details</a><a href='{{ feedback }}' class='btn btn-primary' style='color: white;'><i class='fas fa-comment-dots'></i> Feedback</a></p>{% endif %}").addTo(this);
+    marker = L.marker([{{ facility.location.y }}, {{ facility.location.x }}], {icon: {{ facility.facility_type.marker }}}).bindPopup("<b>{{ facility.name }}</b><br><p>{{ facility.description|linebreaksbr }}</p><p>Responsible team: {{ facility.facility_type.responsible_team.name }} Team</p>{% if request.user.is_authenticated %}<p><a href='{{ detail }}' class='btn btn-primary' style='color: white;'><i class='fas fa-search'></i> Details</a><a href='{{ feedback }}' class='btn btn-primary' style='color: white;'><i class='fas fa-comment-dots'></i> Feedback</a></p>{% endif %}").addTo(this);
     markers.push(marker.getLatLng());
 {% endfor %}
 {% endfor %}