diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index a06452ef..ef40ef4f 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -53,7 +53,18 @@ conform.formatters_by_ft = {
   javascript = { 'prettierd ' },
   typescript = { 'prettierd ' },
   ruby = { 'rubocop' },
+  markdown = { 'markdownlint' },
 }
+conform.format_on_save = function(bufnr)
+  -- Disable "format_on_save lsp_fallback" for languages that don't
+  -- have a well standardized coding style. You can add additional
+  -- languages here or re-enable it for the disabled ones.
+  local disable_filetypes = { c = true, cpp = true }
+  return {
+    timeout_ms = 5000,
+    lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
+  }
+end
 
 return {
   {