diff --git a/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt b/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt
index 4ca9304..99bda0b 100755
--- a/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt
+++ b/app/src/main/java/ru/risdeveau/pixeldragon/api/Server.kt
@@ -28,7 +28,7 @@ suspend fun getHomeserver(url: String): String? {
 }
 
 fun mxcToUrl(mxc: String): String? {
-    val pattern = Regex("mxc://([-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6})/([a-zA-Z0-9]+)")
+    val pattern = Regex("mxc://([-a-zA-Z0-9@:%._+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6})/([^#?]+)")
     val match = pattern.find(mxc)
 
     if ((match?.groupValues[1] == null) or (match?.groupValues[2] == null)) return null