diff --git a/setup.py b/setup.py
index 528a04f..bcf781f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setuptools.setup(
     name="streamlit_folium",
-    version="0.6.8",
+    version="0.6.9",
     author="Randy Zwitch",
     author_email="randy@streamlit.io",
     description="Render Folium objects in Streamlit",
diff --git a/streamlit_folium/frontend/src/index.tsx b/streamlit_folium/frontend/src/index.tsx
index c57c580..e40357d 100644
--- a/streamlit_folium/frontend/src/index.tsx
+++ b/streamlit_folium/frontend/src/index.tsx
@@ -64,10 +64,13 @@ function onRender(event: Event): void {
   function onLayerClick(e: any) {
     const global_data = __GLOBAL_DATA__;
     global_data.last_object_clicked = e.latlng;
+    let details: Array<any> = [];
     if (e.layer && e.layer.toGeoJSON) {
       global_data.last_active_drawing = e.layer.toGeoJSON();
     }
-    let details: Array<any> = global_data.drawnItems.toGeoJSON().features;
+    if (global_data.drawnItems.toGeoJSON) {
+      details = global_data.drawnItems.toGeoJSON().features;
+    }
     global_data.all_drawings = details;
     debouncedUpdateComponentValue()
   }