diff --git a/core/cubes/cpp.el b/core/cubes/cpp.el
index 233b81b..31553c3 100644
--- a/core/cubes/cpp.el
+++ b/core/cubes/cpp.el
@@ -57,6 +57,11 @@ https://github.com/ninja-build/ninja/blob/master/misc/ninja-mode.el"
 			     (lsp)
 			     (require 'company-capf)
                              (require 'company-box)
+
+                             (add-hook 'before-save-hook
+                                       (lambda ()
+                                         (when (and lsp-mode (eq major-mode 'c++-mode))
+                                           (lsp-format-buffer))))
                              (setq company-backends
                                    '((company-capf
                                       company-keywords))))))