diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c
index 67bea830..ebf4a37b 100644
--- a/nx/source/services/fs.c
+++ b/nx/source/services/fs.c
@@ -431,9 +431,13 @@ Result fsOpenFileSystem(FsFileSystem* out, u64 titleId, FsFileSystemType fsType)
 }
 
 Result fsOpenFileSystemWithId(FsFileSystem* out, u64 titleId, FsFileSystemType fsType, const char* contentPath) {
+    char sendStr[FS_MAX_PATH];
+    strncpy(sendStr, contentPath, sizeof(sendStr));
+    sendStr[sizeof(sendStr)-1] = 0;
+
     IpcCommand c;
     ipcInitialize(&c);
-    ipcAddSendStatic(&c, contentPath, strlen(contentPath)+1, 0);
+    ipcAddSendStatic(&c, sendStr, sizeof(sendStr), 0);
 
     struct {
         u64 magic;