diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
index 7b1bc00b..32a5b3d2 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt
@@ -29,13 +29,13 @@ import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
 import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStore
 import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreMigration
 import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule
-import im.vector.matrix.android.internal.crypto.store.db.hash
 import im.vector.matrix.android.internal.crypto.tasks.*
 import im.vector.matrix.android.internal.database.configureEncryption
 import im.vector.matrix.android.internal.di.CryptoDatabase
 import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.session.cache.ClearCacheTask
 import im.vector.matrix.android.internal.session.cache.RealmClearCacheTask
+import im.vector.matrix.android.internal.util.md5
 import io.realm.RealmConfiguration
 import retrofit2.Retrofit
 import java.io.File
@@ -51,7 +51,7 @@ internal abstract class CryptoModule {
         @CryptoDatabase
         @SessionScope
         fun providesRealmConfiguration(context: Context, credentials: Credentials): RealmConfiguration {
-            val userIDHash = credentials.userId.hash()
+            val userIDHash = credentials.userId.md5()
 
             return RealmConfiguration.Builder()
                     .directory(File(context.filesDir, userIDHash))
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
index cbf941f1..4ba484ae 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/Helper.kt
@@ -25,27 +25,9 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
-import java.security.MessageDigest
 import java.util.zip.GZIPInputStream
 
 
-/**
- * Compute a Hash of a String, using md5 algorithm
- */
-fun String.hash() = try {
-    val digest = MessageDigest.getInstance("md5")
-    digest.update(toByteArray())
-    val bytes = digest.digest()
-    val sb = StringBuilder()
-    for (i in bytes.indices) {
-        sb.append(String.format("%02X", bytes[i]))
-    }
-    sb.toString().toLowerCase()
-} catch (exc: Exception) {
-    // Should not happen, but just in case
-    hashCode().toString()
-}
-
 /**
  * Get realm, invoke the action, close realm, and return the result of the action
  */
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt
index b97de018..e57c2893 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Hash.kt
@@ -18,6 +18,9 @@ package im.vector.matrix.android.internal.util
 
 import java.security.MessageDigest
 
+/**
+ * Compute a Hash of a String, using md5 algorithm
+ */
 fun String.md5() = try {
     val digest = MessageDigest.getInstance("md5")
     digest.update(toByteArray())