diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt
index dccef91e..4f10ec80 100644
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt
+++ b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OsmLocation.kt
@@ -81,6 +81,7 @@ internal data class OsmLocation(
         fun fromOverpassResponse(
             result: OverpassResponse
         ): List<OsmLocation> = result.elements.mapNotNull {
+            it.tags ?: return@mapNotNull null
             OsmLocation(
                 id = it.id,
                 label = it.tags["name"] ?: it.tags["brand"] ?: return@mapNotNull null,
diff --git a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt
index 7745c667..12497b8c 100644
--- a/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt
+++ b/data/openstreetmaps/src/main/java/de/mm20/launcher2/openstreetmaps/OverpassApi.kt
@@ -36,7 +36,7 @@ data class OverpassResponseElement(
     val lat: Double?,
     val lon: Double?,
     val center: OverpassResponseElementCenter?,
-    val tags: Map<String, String>,
+    val tags: Map<String, String>?,
 )
 
 interface OverpassApi {