diff --git a/.cljfmt.edn b/.cljfmt.edn
index 17cf420dc137654b0d305c677b31567afd94eeb9..fe256a903262d7a7e09fb2260b624c8e273b4d3f 100644
--- a/.cljfmt.edn
+++ b/.cljfmt.edn
@@ -1,5 +1,9 @@
 ;; Cljfmt config. See https://github.com/weavejester/cljfmt#formatting-options
-{:sort-ns-references?
+{;; Following option is required for cljfmt to run correctly in vscode/calva.
+ ;; Source: https://calva.io/formatting/#indentation-rules
+ :legacy/merge-indents? true
+ 
+ :sort-ns-references?
  true
 
  :function-arguments-indentation