diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
index dc59277f64..ebc2176a13 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/SessionModule.kt
@@ -163,6 +163,7 @@ internal abstract class SessionModule {
         @JvmStatic
         @Provides
         @SessionFilesDirectory
+        @SessionScope
         fun providesFilesDir(@UserMd5 userMd5: String,
                              @SessionId sessionId: String,
                              context: Context): File {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
index e8f74bbd48..8c68e224dc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/RoomSyncEphemeralTemporaryStore.kt
@@ -39,8 +39,11 @@ internal class RoomSyncEphemeralTemporaryStoreFile @Inject constructor(
         moshi: Moshi
 ) : RoomSyncEphemeralTemporaryStore {
 
-    private val workingDir = File(fileDirectory, "rr")
-            .also { it.mkdirs() }
+    private val workingDir: File by lazy {
+        File(fileDirectory, "rr").also {
+            it.mkdirs()
+        }
+    }
 
     private val roomSyncEphemeralAdapter = moshi.adapter(RoomSyncEphemeral::class.java)
 
diff --git a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
index 8a0f829f94..786920aa22 100644
--- a/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/AbstractVoiceRecorder.kt
@@ -26,17 +26,15 @@ abstract class AbstractVoiceRecorder(
         context: Context,
         private val filenameExt: String
 ) : VoiceRecorder {
-    private val outputDirectory = File(context.cacheDir, "voice_records")
+    private val outputDirectory: File by lazy {
+        File(context.cacheDir, "voice_records").also {
+            it.mkdirs()
+        }
+    }
 
     private var mediaRecorder: MediaRecorder? = null
     private var outputFile: File? = null
 
-    init {
-        if (!outputDirectory.exists()) {
-            outputDirectory.mkdirs()
-        }
-    }
-
     abstract fun setOutputFormat(mediaRecorder: MediaRecorder)
     abstract fun convertFile(recordedFile: File?): File?
 
diff --git a/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt b/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt
index f1b316c456..d2f7927d75 100644
--- a/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/voice/VoicePlayerHelper.kt
@@ -27,11 +27,9 @@ import javax.inject.Inject
 class VoicePlayerHelper @Inject constructor(
         context: Context
 ) {
-    private val outputDirectory = File(context.cacheDir, "voice_records")
-
-    init {
-        if (!outputDirectory.exists()) {
-            outputDirectory.mkdirs()
+    private val outputDirectory: File by lazy {
+        File(context.cacheDir, "voice_records").also {
+            it.mkdirs()
         }
     }