diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
index eb36fb554862..cf6b90fe6cab 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/DynamicPlugins.kt
@@ -494,10 +494,22 @@ object DynamicPlugins {
     return null
   }
 
+  @Deprecated("use overload with PluginMainDescriptor parameter")
   fun unloadPluginWithProgress(project: Project? = null,
                                parentComponent: JComponent?,
                                pluginDescriptor: IdeaPluginDescriptorImpl,
                                options: UnloadPluginOptions): Boolean {
+    if (pluginDescriptor !is PluginMainDescriptor) {
+      LOG.warn("Unexpected plugin descriptor type: $pluginDescriptor", Throwable())
+      return false
+    }
+    return unloadPluginWithProgress(project, parentComponent, pluginDescriptor, options)
+  }
+
+  fun unloadPluginWithProgress(project: Project? = null,
+                               parentComponent: JComponent?,
+                               pluginDescriptor: PluginMainDescriptor,
+                               options: UnloadPluginOptions): Boolean {
     return runProcess {
       doUnloadPluginWithProgress(project, parentComponent, pluginDescriptor, options)
     }