diff --git a/templates/components/event.html b/templates/components/event.html
index 4f740621..66494252 100644
--- a/templates/components/event.html
+++ b/templates/components/event.html
@@ -15,6 +15,8 @@
         di <a href="/profile/{{ event.author.username }}">{{ event.author.username }}</a>
     </div>
     <div class="description">
-        {{ event.description }}
+        {% autoescape false %}
+            {{ escape(event.description).replace('\n', '<br>') }}
+        {% endautoescape %}
     </div>
 </div>
\ No newline at end of file
diff --git a/webserver.py b/webserver.py
index 21da25dd..187482ae 100644
--- a/webserver.py
+++ b/webserver.py
@@ -61,7 +61,7 @@ def page_main():
     next_events = db_session.query(db.Event).filter(db.Event.time > datetime.datetime.now()).order_by(db.Event.time).all()
     db_session.close()
     return render_template("main.html", royals=royals, wiki_pages=wiki_pages, diario=random_diario,
-                           next_events=next_events, config=config, a_day=datetime.timedelta(days=1))
+                           next_events=next_events, config=config, escape=escape)
 
 
 @app.route("/profile/<name>")