diff --git a/app/src/main/java/be/gyu/android/server/ftp/FTPSession.java b/app/src/main/java/be/gyu/android/server/ftp/FTPSession.java
index 8630dcb..7dba44f 100644
--- a/app/src/main/java/be/gyu/android/server/ftp/FTPSession.java
+++ b/app/src/main/java/be/gyu/android/server/ftp/FTPSession.java
@@ -182,8 +182,6 @@ public class FTPSession implements Runnable {
             return;
         }
         String path = fileSystem.getCurrentPath();
-        // Convert path to NFD format for MacOS compatibility
-        path = denormalizeFilename(path);
         sendResponse(FTPResponse.PATHNAME_CREATED, "\"" + path + "\" is current directory");
     }
 
@@ -203,8 +201,6 @@ public class FTPSession implements Runnable {
 
         if (fileSystem.changeDirectory(path)) {
             String currentPath = fileSystem.getCurrentPath();
-            // Convert path to NFD format for MacOS compatibility
-            currentPath = denormalizeFilename(currentPath);
             sendResponse(FTPResponse.REQUESTED_FILE_ACTION_OK, "Directory changed to " + currentPath);
         } else {
             sendResponse(FTPResponse.FILE_UNAVAILABLE, "Failed to change directory");
@@ -219,8 +215,6 @@ public class FTPSession implements Runnable {
 
         if (fileSystem.changeToParentDirectory()) {
             String currentPath = fileSystem.getCurrentPath();
-            // Convert path to NFD format for MacOS compatibility
-            currentPath = denormalizeFilename(currentPath);
             sendResponse(FTPResponse.REQUESTED_FILE_ACTION_OK, "Directory changed to " + currentPath);
         } else {
             sendResponse(FTPResponse.FILE_UNAVAILABLE, "Already at root directory");
@@ -239,8 +233,6 @@ public class FTPSession implements Runnable {
         }
 
         String fileList = fileSystem.formatFileList(true);
-        // Convert filenames to NFD format for MacOS compatibility
-        fileList = convertFileListToNFD(fileList);
 
         sendResponse(FTPResponse.FILE_STATUS_OK, "Opening data connection for directory list");
 
@@ -272,8 +264,6 @@ public class FTPSession implements Runnable {
         }
 
         String fileList = fileSystem.formatFileList(false);
-        // Convert filenames to NFD format for MacOS compatibility
-        fileList = convertFileListToNFD(fileList);
 
         sendResponse(FTPResponse.FILE_STATUS_OK, "Opening data connection for name list");
 
@@ -309,8 +299,6 @@ public class FTPSession implements Runnable {
 
         if (fileSystem.makeDirectory(dirName)) {
             String newPath = fileSystem.getCurrentPath() + "/" + dirName;
-            // Convert path to NFD format for MacOS compatibility (NFC -> NFD for display)
-            newPath = denormalizeFilename(newPath);
             sendResponse(FTPResponse.PATHNAME_CREATED, "\"" + newPath + "\" directory created");
         } else {
             sendResponse(FTPResponse.FILE_UNAVAILABLE, "Failed to create directory");