diff --git a/app/src/androidTest/java/com/nextcloud/extensions/BitmapDecodeTests.kt b/app/src/androidTest/java/com/nextcloud/extensions/BitmapDecodeTests.kt
index e6b52cec3ad8..3cd3bdfd0fc1 100644
--- a/app/src/androidTest/java/com/nextcloud/extensions/BitmapDecodeTests.kt
+++ b/app/src/androidTest/java/com/nextcloud/extensions/BitmapDecodeTests.kt
@@ -69,6 +69,12 @@ class BitmapDecodeTests {
         assertNull(result)
     }
 
+    @Test
+    fun testToFileWhenPathIsNullShouldReturnNull() {
+        val result = null.toFile()
+        assertNull(result)
+    }
+
     @Test
     fun testToFileWhenFileDoesNotExistShouldReturnNull() {
         val nonExistentPath = tempDir.resolve("does_not_exist.jpg")
diff --git a/app/src/main/java/com/nextcloud/utils/extensions/FileExtensions.kt b/app/src/main/java/com/nextcloud/utils/extensions/FileExtensions.kt
index 1804550bff03..b7fedf75857c 100644
--- a/app/src/main/java/com/nextcloud/utils/extensions/FileExtensions.kt
+++ b/app/src/main/java/com/nextcloud/utils/extensions/FileExtensions.kt
@@ -37,7 +37,7 @@ fun Path.toLocalPath(): String = toAbsolutePath().toString()
  * @return [File] instance if the file exists, or `null` if the path is null, empty, or non-existent.
  */
 @Suppress("ReturnCount")
-fun String.toFile(): File? {
+fun String?.toFile(): File? {
     if (isNullOrEmpty()) {
         Log_OC.w(TAG, "given path is null or empty: $this")
         return null