diff --git a/src/main/kotlin/com/intellij/plugin/powershell/ide/ErrorReportSubmitter.kt b/src/main/kotlin/com/intellij/plugin/powershell/ide/ErrorReportSubmitter.kt
deleted file mode 100644
index 6d6af46a..00000000
--- a/src/main/kotlin/com/intellij/plugin/powershell/ide/ErrorReportSubmitter.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.intellij.plugin.powershell.ide
-
-import com.intellij.openapi.diagnostic.ErrorReportSubmitter
-import com.intellij.openapi.diagnostic.IdeaLoggingEvent
-import com.intellij.openapi.extensions.ExtensionNotApplicableException
-
-class ErrorReportSubmitter : ErrorReportSubmitter() {
-
-  private val delegate: ErrorReportSubmitter
-
-  init {
-    try {
-      delegate = Class.forName("com.intellij.diagnostic.JetBrainsMarketplaceErrorReportSubmitter")
-        .declaredConstructors.first().newInstance() as ErrorReportSubmitter
-    } catch (e: ClassNotFoundException) {
-      throw ExtensionNotApplicableException.create()
-    }
-  }
-
-  override fun changeReporterAccount(parentComponent: java.awt.Component): Unit =
-    delegate.changeReporterAccount(parentComponent)
-
-  override fun getPrivacyNoticeText(): String? = delegate.privacyNoticeText
-
-  override fun getReportActionText(): String = delegate.reportActionText
-
-  override fun getReporterAccount(): String? = delegate.reporterAccount
-
-  override fun submit(
-    events: Array<IdeaLoggingEvent>,
-    additionalInfo: String?,
-    parentComponent: java.awt.Component,
-    consumer: com.intellij.util.Consumer<in com.intellij.openapi.diagnostic.SubmittedReportInfo>
-  ): Boolean =
-    delegate.submit(events, additionalInfo, parentComponent, consumer)
-}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 00c7ffd3..8ed84eb6 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -114,7 +114,7 @@
 
     <editorFactoryListener implementation="com.intellij.plugin.powershell.lang.lsp.ide.listeners.EditorLSPListener"/>
 
-    <errorHandler implementation="com.intellij.plugin.powershell.ide.ErrorReportSubmitter"/>
+    <errorHandler implementation="com.intellij.diagnostic.JetBrainsMarketplaceErrorReportSubmitter"/>
 
     <notificationGroup displayType="STICKY_BALLOON" id="PowerShell.MissingExtension" hideFromSettings="true"/>
   </extensions>