diff --git a/style/checkstyle-suppressions.xml b/style/checkstyle-suppressions.xml
index 02a7a4a0f..9d2e32615 100644
--- a/style/checkstyle-suppressions.xml
+++ b/style/checkstyle-suppressions.xml
@@ -9,4 +9,5 @@
   <suppress checks="indentation" files="HoodieLogFileCommand.java" lines="1-9999"/>
   <!-- Member Names expected to start with "_"  -->
   <suppress checks="naming" files="TestRecord.java" lines="1-9999"/>
+  <suppress checks="IllegalImport" files="Option.java" />
 </suppressions>
diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index c0667b274..40ec255f8 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -242,5 +242,8 @@
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation"/>
+        <module name="IllegalImport">
+            <property name="illegalClasses" value="java.util.Optional, com.google.common.base.Optional" />
+        </module>
     </module>
 </module>