diff --git a/.emacs.d/lisp/init-lispy.el b/.emacs.d/lisp/init-lispy.el
index b4618d37..709fddfa 100644
--- a/.emacs.d/lisp/init-lispy.el
+++ b/.emacs.d/lisp/init-lispy.el
@@ -109,6 +109,22 @@ replace the expression with its result."
       (sly-mrepl-mode
        le-lisp lispy--eval-lisp)
       (hy-mode
-       le-hy lispy--eval-hy))))
+       le-hy lispy--eval-hy)))
+
+  ;; REVIEW: Remove this workaround when upstream has fixed
+  ;; https://github.com/abo-abo/lispy/issues/550.
+  (setq lispy-parens-preceding-syntax-alist
+        '((lisp-mode . ("[#`',.@]+" "#[0-9]*" "#[.,Ss+-]" "#[0-9]+[=Aa]"))
+          ;; NEW:
+          (sly-mrepl-mode . ("[[:space:]]" "[#`',.@]+" "#[0-9]*" "#[.,Ss+-]" "#[0-9]+[=Aa]"))
+          (emacs-lisp-mode . ("[#`',@]+" "#s" "#[0-9]+="))
+          (clojure-mode . ("[`'~@]+" "#" "#\\?@?"))
+          (clojurescript-mode . ("[`'~@]+" "#" "#\\?@?"))
+          (clojurec-mode . ("[`'~@]+" "#" "#\\?@?"))
+          (cider-repl-mode . ("[`'~@]+" "#" "#\\?@?"))
+          (cider-clojure-interaction-mode . ("[`'~@]+" "#" "#\\?@?"))
+          (janet-mode . ("[@;]"))
+          (scheme-mode . ("[#`',@]+" "#hash"))
+          (t . ("[`',@]+")))))
 
 (provide 'init-lispy)