diff --git a/src/org/thoughtcrime/securesms/map/MapDataManager.java b/src/org/thoughtcrime/securesms/map/MapDataManager.java
index ae94e41fa..46eb05b02 100644
--- a/src/org/thoughtcrime/securesms/map/MapDataManager.java
+++ b/src/org/thoughtcrime/securesms/map/MapDataManager.java
@@ -399,6 +399,7 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate,
 
     private void initInfoWindowLayer() {
         Expression iconOffset = switchCase(
+                toBool(get(IS_EMOJI_CHAR)), literal(new Float[] {-2f, -23f}),
                 toBool(get(LAST_LOCATION)), literal(new Float[] {-2f, -25f}),
                 literal(new Float[] {-2f, -20f}));
         GeoJsonSource infoWindowSource = new GeoJsonSource(INFO_WINDOW_SRC);