diff --git a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/DataStoreHubEventStreamHandler.kt b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/DataStoreHubEventStreamHandler.kt index 428b33acc1..14e5326c03 100644 --- a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/DataStoreHubEventStreamHandler.kt +++ b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/DataStoreHubEventStreamHandler.kt @@ -223,6 +223,8 @@ class DataStoreHubEventStreamHandler : EventChannel.StreamHandler { override fun onCancel(p0: Any?) { eventSink = null - Amplify.Hub.unsubscribe(token) + if (this::token.isInitialized) { + Amplify.Hub.unsubscribe(token) + } } }