diff --git a/CHANGES.md b/CHANGES.md
index 0cb2475b36..0e1edb520e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@ Release Notes.
   * Upgrade  maven-compiler-plugin to 3.10.0.
   * Upgrade  maven-resources-plugin to 3.2.0.
   * Upgrade  maven-source-plugin to 3.2.1.
+* Update codeStyle.xml to fix incompatibility on M1's IntelliJ IDEA 2021.3.2.
 
 #### OAP Server
 
diff --git a/codeStyle.xml b/codeStyle.xml
index 55e18bfcf7..e4f0b3d70e 100644
--- a/codeStyle.xml
+++ b/codeStyle.xml
@@ -1,6 +1,4 @@
 <code_scheme name="sky-walking" version="173">
-  <option name="USE_SAME_INDENTS" value="true" />
-  <option name="IGNORE_SAME_INDENTS_FOR_LANGUAGES" value="true" />
   <option name="OTHER_INDENT_OPTIONS">
     <value>
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -12,7 +10,6 @@
     <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
     <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-    <option name="INSERT_OVERRIDE_ANNOTATION" value="true" />
     <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
       <value />
     </option>
@@ -25,9 +22,6 @@
     </option>
     <option name="JD_P_AT_EMPTY_LINES" value="false" />
   </JavaCodeStyleSettings>
-  <XML>
-    <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-  </XML>
   <ADDITIONAL_INDENT_OPTIONS fileType="haml">
     <option name="INDENT_SIZE" value="2" />
   </ADDITIONAL_INDENT_OPTIONS>
@@ -102,4 +96,4 @@
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>
\ No newline at end of file
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
index beabd17bb3..3646643f11 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/Event.java
@@ -155,7 +155,7 @@ public class Event extends Metrics implements ISource, WithMetadata, LongValueHo
      */
     public void setParameters(String parameters) {
         this.parameters = parameters == null || parameters.length() <= PARAMETER_MAX_LENGTH ?
-                parameters : parameters.substring(0, PARAMETER_MAX_LENGTH);
+            parameters : parameters.substring(0, PARAMETER_MAX_LENGTH);
     }
 
     @Override