diff --git a/images/src/org/intellij/images/editor/impl/jcef/JCefImageViewer.kt b/images/src/org/intellij/images/editor/impl/jcef/JCefImageViewer.kt
index 03bd71c8b28b..9b280ffd5ba4 100644
--- a/images/src/org/intellij/images/editor/impl/jcef/JCefImageViewer.kt
+++ b/images/src/org/intellij/images/editor/impl/jcef/JCefImageViewer.kt
@@ -132,7 +132,6 @@ class JCefImageViewer(private val myFile: VirtualFile,
   override fun dispose() {
     ourCefClient.removeRequestHandler(myRequestHandler, myBrowser.cefBrowser)
     ourCefClient.removeLoadHandler(myLoadHandler, myBrowser.cefBrowser)
-    myViewerStateJSQuery.clearHandlers()
     myDocument.removeDocumentListener(this)
   }
 
@@ -237,6 +236,7 @@ class JCefImageViewer(private val myFile: VirtualFile,
     Disposer.register(this, myBrowser)
 
     myViewerStateJSQuery = JBCefJSQuery.create(myBrowser as JBCefBrowserBase)
+    Disposer.register(this, myViewerStateJSQuery)
     myViewerStateJSQuery.addHandler { s: String ->
       val oldState = myState
       try {