diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt
index bfbfb1585..4fa7979d2 100644
--- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt
+++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.kt
@@ -587,37 +587,35 @@ ${"wd:" + place.wikiDataEntityId}"""
         val placeBindings = runQuery(leftLatLng, rightLatLng)
         if (placeBindings != null) {
             for ((item1, label, location, clas) in placeBindings) {
-                if (item1 != null && label != null && clas != null) {
-                    val input = location.value
-                    val pattern = Pattern.compile(
-                        "Point\\(([-+]?[0-9]*\\.?[0-9]+) ([-+]?[0-9]*\\.?[0-9]+)\\)"
-                    )
-                    val matcher = pattern.matcher(input)
+                val input = location.value
+                val pattern = Pattern.compile(
+                    "Point\\(([-+]?[0-9]*\\.?[0-9]+) ([-+]?[0-9]*\\.?[0-9]+)\\)"
+                )
+                val matcher = pattern.matcher(input)
 
-                    if (matcher.find()) {
-                        val longStr = matcher.group(1)
-                        val latStr = matcher.group(2)
-                        val itemUrl = item1.value
-                        val itemName = label.value.replace("&", "&")
-                        val itemLatitude = latStr
-                        val itemLongitude = longStr
-                        val itemClass = clas.value
+                if (matcher.find()) {
+                    val longStr = matcher.group(1)
+                    val latStr = matcher.group(2)
+                    val itemUrl = item1.value
+                    val itemName = label.value.replace("&", "&")
+                    val itemLatitude = latStr
+                    val itemLongitude = longStr
+                    val itemClass = clas.value
 
-                        val formattedItemName = if (!itemClass.isEmpty())
-                            "$itemName ($itemClass)"
-                        else
-                            itemName
+                    val formattedItemName = if (!itemClass.isEmpty())
+                        "$itemName ($itemClass)"
+                    else
+                        itemName
 
-                        val gpxEntry =
-                            ("""
-    <wpt lat="$itemLatitude" lon="$itemLongitude">
-        <name>$itemName</name>
-        <url>$itemUrl</url>
-    </wpt>""")
-                        gpxString = gpxString + gpxEntry
-                    } else {
-                        Timber.e("No match found")
-                    }
+                    val gpxEntry =
+                        ("""
+<wpt lat="$itemLatitude" lon="$itemLongitude">
+    <name>$itemName</name>
+    <url>$itemUrl</url>
+</wpt>""")
+                    gpxString = gpxString + gpxEntry
+                } else {
+                    Timber.e("No match found")
                 }
             }
         }