diff --git a/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchDemoActivity.kt b/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchDemoActivity.kt
index f223cc4..21d4c17 100644
--- a/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchDemoActivity.kt
+++ b/app/src/main/java/com/google/places/android/ktx/demo/PlacesSearchDemoActivity.kt
@@ -91,7 +91,7 @@ class PlacesSearchDemoActivity : AppCompatActivity() {
         val linearLayoutManager = LinearLayoutManager(this)
         findViewById<RecyclerView>(R.id.recycler_view).apply {
             layoutManager = linearLayoutManager
-            adapter = adapter
+            adapter = this@PlacesSearchDemoActivity.adapter
             addItemDecoration(
                 DividerItemDecoration(
                     this@PlacesSearchDemoActivity,
diff --git a/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt b/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt
index 9433d9d..67aa7cb 100644
--- a/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt
+++ b/places-ktx/src/main/java/com/google/android/libraries/places/ktx/widget/AutocompleteSupportFragment.kt
@@ -5,6 +5,7 @@ import com.google.android.libraries.places.api.model.Place
 import com.google.android.libraries.places.widget.AutocompleteSupportFragment
 import com.google.android.libraries.places.widget.listener.PlaceSelectionListener
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 
@@ -26,4 +27,5 @@ fun AutocompleteSupportFragment.placeSelectionEvents() : Flow<PlaceSelectionResu
                 offer(PlaceSelectionError(status))
             }
         })
+        awaitClose { this@placeSelectionEvents.setOnPlaceSelectedListener(null) }
     }