diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt b/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt
index a0833011a973..624092deb115 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt
+++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNProxy.kt
@@ -57,7 +57,7 @@ internal object ITNProxy {
   private const val DEFAULT_USER = "idea_anonymous"
   private const val DEFAULT_PASS = "guest"
   private const val DEVELOPERS_LIST_URL = "https://ea-report.jetbrains.com/developer/list"
-  // private const val OLD_THREAD_VIEW_URL = "https://ea.jetbrains.com/browser/ea_reports/"
+  private const val OLD_THREAD_VIEW_URL = "https://ea.jetbrains.com/browser/ea_reports/"
   private const val NEW_THREAD_VIEW_URL = "https://jb-web.exa.aws.intellij.net/report/"
 
   private val TEMPLATE: Map<String, String?> by lazy {
@@ -123,9 +123,9 @@ internal object ITNProxy {
     return postNewThread(loginAdjusted, passwordAdjusted, error, newThreadPostUrl)
   }
 
-  fun getBrowseUrl(threadId: Int): String? {
+  fun getBrowseUrl(threadId: Int): String {
     val isEAPluginInstalled = PluginManagerCore.isPluginInstalled(PluginId.getId(EA_PLUGIN_ID))
-    return if (isEAPluginInstalled) NEW_THREAD_VIEW_URL + threadId else null
+    return (if (isEAPluginInstalled) NEW_THREAD_VIEW_URL else OLD_THREAD_VIEW_URL) + threadId
   }
 
   private val ourSslContext: SSLContext by lazy { initContext() }
diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt
index 1bac7685f6f4..9b20bf06334f 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt
+++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt
@@ -149,9 +149,7 @@ open class ITNReporter(private val postUrl: String = "https://ea-report.jetbrain
     val content = DiagnosticBundle.message("error.report.gratitude")
     val title = DiagnosticBundle.message("error.report.submitted")
     val notification = Notification("Error Report", title, content, NotificationType.INFORMATION).setImportant(false)
-    if (reportUrl != null) {
-      notification.addAction(NotificationAction.createSimpleExpiring(DiagnosticBundle.message("error.report.view.action")) { BrowserUtil.browse(reportUrl) })
-    }
+    notification.addAction(NotificationAction.createSimpleExpiring(DiagnosticBundle.message("error.report.view.action")) { BrowserUtil.browse(reportUrl) })
     notification.notify(project)
   }