diff --git a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java
index db8e3136e7d9269cab72bfb8e3323ea932a96467..648ad049b5761592ba0e525a747edd916846d9b2 100644
--- a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java
@@ -12,8 +12,8 @@ import eu.siacs.conversations.entities.Conversational;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.ui.ShareLocationActivity;
 import eu.siacs.conversations.ui.ShowLocationActivity;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import org.osmdroid.util.GeoPoint;
@@ -160,8 +160,11 @@ public class GeoHelper {
 
     private static String getLabel(Context context, Message message) {
         if (message.getStatus() == Message.STATUS_RECEIVED) {
-            return URLEncoder.encode(
-                    UIHelper.getMessageDisplayName(message), StandardCharsets.UTF_8);
+            try {
+                return URLEncoder.encode(UIHelper.getMessageDisplayName(message), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new AssertionError(e);
+            }
         } else {
             return context.getString(R.string.me);
         }