diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
index d710fd36c3..79e5ed797a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/DefaultContentUrlResolver.kt
@@ -82,7 +82,7 @@ internal class DefaultContentUrlResolver @Inject constructor(
 
     private fun resolve(contentUrl: String,
                         toThumbnail: Boolean,
-                        params: String = ""): String? {
+                        params: String = ""): String {
         var serverAndMediaId = contentUrl.removePrefix(MatrixUrls.MATRIX_CONTENT_URI_SCHEME)
 
         val apiPath = if (scannerService.isScannerEnabled()) {