diff --git a/uncrustify.cfg b/uncrustify.cfg
index e27a574..8db3e27 100644
--- a/uncrustify.cfg
+++ b/uncrustify.cfg
@@ -864,7 +864,7 @@
 
 # Add or remove space after the opening of a C++ comment,
 # i.e. '// A' vs. '//A'.
-sp_cmt_cpp_start                = ignore    # ignore/add/remove/force
+sp_cmt_cpp_start                = force    # ignore/add/remove/force
 
 # If true, space is added with sp_cmt_cpp_start will be added after doxygen
 # sequences like '///', '///<', '//!' and '//!<'.
@@ -875,7 +875,7 @@
 sp_cmt_cpp_qttr                 = true     # true/false
 
 # Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = ignore   # ignore/add/remove/force
+sp_endif_cmt                    = force    # ignore/add/remove/force
 
 # Add or remove space after 'new', 'delete' and 'delete[]'.
 sp_after_new                    = ignore   # ignore/add/remove/force