diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/EdtDataContext.kt b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/EdtDataContext.kt
index d10166b659f0..98c30d725ab5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/EdtDataContext.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/EdtDataContext.kt
@@ -142,7 +142,7 @@ open class EdtDataContext : DataContext, UserDataHolder, InjectedDataContextSupp
 
     answer = calcData(dataId, component)
     if (CommonDataKeys.EDITOR.`is`(dataId) || CommonDataKeys.HOST_EDITOR.`is`(dataId) || InjectedDataKeys.EDITOR.`is`(dataId)) {
-      answer = DataManagerImpl.validateEditor(answer as Editor?, component)
+      answer = DataManagerImpl.validateEditor(answer as? Editor, component)
     }
     if (cacheable) {
       cachedData.put(dataId, answer ?: CustomizedDataContext.EXPLICIT_NULL)