@@ -959,7 +959,7 @@ class FirebaseDatabasePlugin :
       val streamHandler = EventStreamHandler(query, object : OnDispose {
         override fun run() {
           // Clean up when the stream is disposed
-          streamHandlers.remove(eventChannel)
+         eventChannel.setStreamHandler(null)
         }
       })
       eventChannel.setStreamHandler(streamHandler)
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ class FirebaseDatabasePlugin :`
`959`	`959`	`val streamHandler = EventStreamHandler(query, object : OnDispose {`
`960`	`960`	`override fun run() {`
`961`	`961`	`// Clean up when the stream is disposed`
`962`		`- streamHandlers.remove(eventChannel)`
	`962`	`+ eventChannel.setStreamHandler(null)`
`963`	`963`	`}`
`964`	`964`	`})`
`965`	`965`	`eventChannel.setStreamHandler(streamHandler)`