diff --git a/requirements.txt b/requirements.txt
index 6deed4bd..895b5f19 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 #djangorestframework==2.3.13    # It's not necessary since Taiga 1.7
 CairoSVG==2.0.3
 Django==1.11.2
-Markdown==2.6.8
+git+git://github.com/Python-Markdown/markdown.git@a4d4b61b5ce4a7dd96ddc13c66b8716d3ad8eb51 # This version solves 'infinite execution' and other issues.
 Pillow==4.1.1
 PyJWT==1.5.0
 Unidecode==0.4.20
diff --git a/taiga/mdrender/service.py b/taiga/mdrender/service.py
index 0865bdd4..0347897d 100644
--- a/taiga/mdrender/service.py
+++ b/taiga/mdrender/service.py
@@ -45,7 +45,6 @@ from markdown import Markdown
 from .extensions.autolink import AutolinkExtension
 from .extensions.automail import AutomailExtension
 from .extensions.semi_sane_lists import SemiSaneListExtension
-from .extensions.spaced_link import SpacedLinkExtension
 from .extensions.strikethrough import StrikethroughExtension
 from .extensions.wikilinks import WikiLinkExtension
 from .extensions.emojify import EmojifyExtension
@@ -70,7 +69,6 @@ def _make_extensions_list(project=None):
     return [AutolinkExtension(),
             AutomailExtension(),
             SemiSaneListExtension(),
-            SpacedLinkExtension(),
             StrikethroughExtension(),
             WikiLinkExtension(project),
             EmojifyExtension(),