diff --git a/.editorconfig b/.editorconfig
index 93b94d1685..1d37fcc386 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -236,7 +236,7 @@ csharp_style_prefer_readonly_struct_member = true
 # Code-block preferences
 csharp_prefer_braces = false:warning
 csharp_prefer_simple_using_statement = true
-# csharp_style_namespace_declarations = file_scoped #This allows for no {  } for namespaces
+csharp_style_namespace_declarations = file_scoped:error #This allows for no {  } for namespaces
 csharp_style_prefer_method_group_conversion = true
 csharp_style_prefer_primary_constructors = false:warning
 csharp_style_prefer_top_level_statements = true
@@ -312,7 +312,6 @@ csharp_space_between_square_brackets = false
 
 # Wrapping preferences
 csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = false #our setting:false. Set to true if performing a dotnet format https://stackoverflow.com/questions/49760158/visual-studio-2017-auto-formatting-single-line-if-statements-without-braces
 
 # Resharper