diff --git a/bundle/hooks.el b/bundle/hooks.el
index a0616210..7a12e3e2 100644
--- a/bundle/hooks.el
+++ b/bundle/hooks.el
@@ -4,4 +4,8 @@
 (add-hook 'markdown-mode-hook 'turn-on-font-lock)
 (add-hook 'python-mode-hook 'turn-on-font-lock)
 (add-hook 'org-mode-hook 'turn-on-font-lock)
+(add-hook 'elpy-mode-hook (lambda () (highlight-indentation-mode -1)))
+
+(elpy-enable)
+
 (provide 'hooks)