diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptor.kt
index 3dc9b7229..6da1cdff5 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptor.kt
@@ -72,18 +72,18 @@ class LocalBlossomCacheRedirectInterceptor(
     }
 
     private fun findSha256AndExtensionInPath(url: HttpUrl): Triple<Int, String, String>? {
-        // Walk segments right-to-left so CDNs that put a cache prefix (itself a
-        // 64-char hex segment) ahead of the blob hash — e.g.
-        // `https://share.yabu.me/<prefix>/<sha>.webp` — still resolve to the
-        // blob and leave the prefix in `xs`.
-        for (index in url.pathSegments.indices.reversed()) {
-            val segment = url.pathSegments[index]
-            val match = SHA256_SEGMENT_REGEX.find(segment) ?: continue
-            val sha = match.value.lowercase()
-            val ext = guessExtensionFrom(segment, sha) ?: "bin"
-            return Triple(index, sha, ext)
-        }
-        return null
+        // Per Blossom (BUD-01) the blob is always the last path segment. If the
+        // last segment isn't a sha256, this isn't a Blossom URL and the bridge
+        // must leave it alone — even if an earlier path segment happens to be
+        // a 64-char hex (e.g. a per-user cache prefix). The prefix segments
+        // are preserved verbatim via `buildServerBase`.
+        val lastIndex = url.pathSegments.lastIndex
+        if (lastIndex < 0) return null
+        val segment = url.pathSegments[lastIndex]
+        val match = SHA256_SEGMENT_REGEX.find(segment) ?: return null
+        val sha = match.value.lowercase()
+        val ext = guessExtensionFrom(segment, sha) ?: "bin"
+        return Triple(lastIndex, sha, ext)
     }
 
     /**
diff --git a/amethyst/src/test/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptorTest.kt b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptorTest.kt
index f17c0bea4..2edbe3c55 100644
--- a/amethyst/src/test/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptorTest.kt
+++ b/amethyst/src/test/java/com/vitorpamplona/amethyst/service/okhttp/LocalBlossomCacheRedirectInterceptorTest.kt
@@ -133,7 +133,7 @@ class LocalBlossomCacheRedirectInterceptorTest {
     }
 
     @Test
-    fun bridgeOnPicksRightmostShaWhenPathHasTwoHashes() {
+    fun bridgeOnRewritesShaInLastPathSegmentWithHexPrefix() {
         // share.yabu.me layout: <cache-prefix-sha>/<blob-sha>.<ext>
         val interceptor = LocalBlossomCacheRedirectInterceptor { true }
         val captured = mutableListOf<String>()
@@ -151,6 +151,18 @@ class LocalBlossomCacheRedirectInterceptorTest {
         response.close()
     }
 
+    @Test
+    fun bridgeOnSkipsWhenLastSegmentIsNotSha() {
+        // Per BUD-01 the last segment is the blob; if it isn't a sha256, the
+        // URL isn't a Blossom blob even if an earlier segment is hex.
+        val interceptor = LocalBlossomCacheRedirectInterceptor { true }
+        val captured = mutableListOf<String>()
+        val url = "https://example.com/$sha/avatar.jpg"
+        val response = interceptor.intercept(fakeChain(url, captured))
+        assertEquals(url, captured.single())
+        response.close()
+    }
+
     private fun fakeChain(
         url: String,
         captured: MutableList<String>,
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExt.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExt.kt
index 6f8d6ce74..fd203d426 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExt.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExt.kt
@@ -144,11 +144,13 @@ private fun percentEncode(input: String): String {
 }
 
 private fun extractSha256FromUrlPath(url: String): String? {
+    // Per Blossom (BUD-01) the blob is always the last path segment. If the
+    // last segment isn't a sha256, this isn't a Blossom URL and the bridge
+    // must leave it alone — even if an earlier path segment happens to be
+    // a 64-char hex (e.g. a per-user cache prefix).
     val pathPart = url.substringBefore('?').substringBefore('#')
-    // Prefer the rightmost 64-char hex segment so CDNs that put a cache prefix
-    // (itself a 64-char hex) ahead of the blob hash — e.g.
-    // `https://share.yabu.me/<prefix>/<sha>.webp` — still resolve to the blob.
-    val match = sha256InPathRegex.findAll(pathPart).lastOrNull() ?: return null
+    val lastSegment = pathPart.substringAfterLast('/')
+    val match = sha256InPathRegex.find(lastSegment) ?: return null
     return match.value.lowercase()
 }
 
diff --git a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExtTest.kt b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExtTest.kt
index ee7d28e7b..ce50e3e0c 100644
--- a/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExtTest.kt
+++ b/commons/src/commonTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/MediaUrlContentExtTest.kt
@@ -175,7 +175,7 @@ class MediaUrlContentExtTest {
     }
 
     @Test
-    fun bridgeOnPicksRightmostShaWhenPathHasTwoHashes() {
+    fun bridgeOnRewritesShaInLastPathSegmentWithHexPrefix() {
         // share.yabu.me layout: <cache-prefix-sha>/<blob-sha>.<ext>
         val image =
             MediaUrlImage(
@@ -189,7 +189,7 @@ class MediaUrlContentExtTest {
     }
 
     @Test
-    fun bridgeProfilePictureUrlPicksRightmostShaWhenPathHasTwoHashes() {
+    fun bridgeProfilePictureUrlRewritesShaInLastPathSegmentWithHexPrefix() {
         assertEquals(
             "http://127.0.0.1:24242/28fa4d999af6ae3e4e11bfc2727130ef1b3a13cc0f981e5a93c3996cb2f524e5.webp?xs=https%3A%2F%2Fshare.yabu.me%2F84b0c46ab699ac35eb2ca286470b85e081db2087cdef63932236c397417782f5",
             bridgeProfilePictureUrl(
@@ -198,4 +198,19 @@ class MediaUrlContentExtTest {
             ),
         )
     }
+
+    @Test
+    fun bridgeOnSkipsWhenLastSegmentIsNotSha() {
+        // Per BUD-01 the last segment is the blob; if it isn't a sha256, the
+        // URL isn't a Blossom blob even if an earlier segment is hex.
+        val url = "https://example.com/$sha/avatar.jpg"
+        val image = MediaUrlImage(url = url, hash = null)
+        assertEquals(url, image.toCoilModel(useLocalBlossomBridge = true))
+    }
+
+    @Test
+    fun bridgeProfilePictureUrlSkipsWhenLastSegmentIsNotSha() {
+        val url = "https://example.com/$sha/avatar.jpg"
+        assertEquals(url, bridgeProfilePictureUrl(url, useBridge = true))
+    }
 }