diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
index d466f17f9b..6baef9f1a2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/nip22Comments/GenericCommentPostScreen.kt
@@ -106,6 +106,7 @@ import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.SuggestionListDefaultHeightPage
 import com.vitorpamplona.amethyst.ui.theme.replyModifier
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import com.vitorpamplona.quartz.nip73ExternalIds.location.GeohashId
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.collections.immutable.toImmutableSet
@@ -244,9 +245,16 @@ private fun GenericCommentPostBody(
         ) {
             Column(Modifier.fillMaxWidth().verticalScroll(scrollState, reverseScrolling = true)) {
                 postViewModel.externalIdentity?.let {
-                    Row {
-                        DisplayExternalId(it, accountViewModel, nav)
+                    if (it is GeohashId) {
+                        // Geo-post: the interactive location channel (with retarget) replaces
+                        // the static external-id marker so there's a single location control.
+                        GeoPostLocationChannel(postViewModel)
                         Spacer(modifier = StdVertSpacer)
+                    } else {
+                        Row {
+                            DisplayExternalId(it, accountViewModel, nav)
+                            Spacer(modifier = StdVertSpacer)
+                        }
                     }
                 }
 
@@ -311,8 +319,6 @@ private fun GenericCommentPostBody(
                     )
                 }
 
-                GeoPostLocationChannel(postViewModel)
-
                 DisplayPreviews(postViewModel.urlPreviews, accountViewModel, nav)
 
                 if (postViewModel.wantsToMarkAsSensitive) {