diff --git a/dirs.c b/dirs.c
index 7ddecdff02..95a57fa3f2 100644
--- a/dirs.c
+++ b/dirs.c
@@ -291,12 +291,10 @@ void dir_check_defaults(void)
    /* early return for people with a custom folder setup
       so it doesn't create unnecessary directories
     */
-#ifdef ORBIS
-   if (filestream_exists("host0:app/custom.ini"))
-#elif defined(ANDROID)
-   if (filestream_exists("host0:app/custom.ini"))
+#if defined(ORBIS) || defined(ANDROID)
+   if (path_is_valid("host0:app/custom.ini"))
 #else
-   if (filestream_exists("custom.ini"))
+   if (path_is_valid("custom.ini"))
 #endif
       return;
 
diff --git a/discord/discord.c b/discord/discord.c
index e11dcf089a..f176ac38ef 100644
--- a/discord/discord.c
+++ b/discord/discord.c
@@ -138,7 +138,7 @@ static bool discord_download_avatar(
    fill_pathname_join(full_path, buf, avatar_id, sizeof(full_path));
    strlcpy(user_avatar, avatar_id, sizeof(user_avatar));
 
-   if(filestream_exists(full_path))
+   if (path_is_valid(full_path))
       return true;
 
    if (string_is_empty(avatar_id))