diff --git a/client/core/controllers/serverController.cpp b/client/core/controllers/serverController.cpp
index 8b250f18..9a170a85 100644
--- a/client/core/controllers/serverController.cpp
+++ b/client/core/controllers/serverController.cpp
@@ -211,13 +211,7 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
     localFile.write(data);
     localFile.close();
 
-#ifdef Q_OS_WINDOWS
-    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toLocal8Bit().toStdString(), remotePath.toStdString(),
-                                     "non_desc");
-#else
-    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName().toStdString(), remotePath.toStdString(),
-                                     "non_desc");
-#endif
+    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName(), remotePath, "non_desc");
 
     if (error != ErrorCode::NoError) {
         return error;
diff --git a/client/core/sshclient.cpp b/client/core/sshclient.cpp
index 0ac95662..03670b30 100644
--- a/client/core/sshclient.cpp
+++ b/client/core/sshclient.cpp
@@ -222,7 +222,7 @@ namespace libssh {
         return fromLibsshErrorCode();
     }
 
-    ErrorCode Client::sftpFileCopy(const SftpOverwriteMode overwriteMode, const std::string& localPath, const std::string& remotePath, const std::string& fileDesc)
+    ErrorCode Client::sftpFileCopy(const SftpOverwriteMode overwriteMode, const QString& localPath, const QString& remotePath, const QString &fileDesc)
     {
         m_sftpSession = sftp_new(m_session);
 
@@ -245,40 +245,38 @@ namespace libssh {
             const size_t bufferSize = 16384;
             char buffer[bufferSize];
 
-            file = sftp_open(m_sftpSession, remotePath.c_str(), accessType, S_IRWXU);
+            file = sftp_open(m_sftpSession, remotePath.toStdString().c_str(), accessType, S_IRWXU);
 
             if (file == nullptr) {
                 return closeSftpSession();
             }
 
-            int localFileSize = std::filesystem::file_size(localPath);
+            int localFileSize = QFileInfo(localPath).size();
             int chunksCount = localFileSize / (bufferSize);
 
-            std::ifstream fin(localPath, std::ios::binary | std::ios::in);
+            QFile fin(localPath);
 
-            if (fin.is_open()) {
+            if (fin.open(QIODevice::ReadOnly)) {
                 for (int currentChunkId = 0; currentChunkId < chunksCount; currentChunkId++) {
-                    fin.read(buffer, bufferSize);
+                    QByteArray chunk = fin.read(bufferSize);
+                    if (chunk.size() != bufferSize) return ErrorCode::SshSftpEofError;
 
-                    int bytesWritten = sftp_write(file, buffer, bufferSize);
+                    int bytesWritten = sftp_write(file, chunk.data(), chunk.size());
 
-                    std::string chunk(buffer, bufferSize);
-
-                    if (bytesWritten != bufferSize) {
+                    if (bytesWritten != chunk.size()) {
                         fin.close();
                         sftp_close(file);
                         return closeSftpSession();
                     }
                 }
 
-                int lastChunkSize = localFileSize % (bufferSize);
+                int lastChunkSize = localFileSize % bufferSize;
 
                 if (lastChunkSize != 0) {
-                    fin.read(buffer, lastChunkSize);
+                    QByteArray lastChunk = fin.read(lastChunkSize);
+                    if (lastChunk.size() != lastChunkSize) return ErrorCode::SshSftpEofError;
 
-                    std::string chunk(buffer, lastChunkSize);
-
-                    int bytesWritten = sftp_write(file, buffer, lastChunkSize);
+                    int bytesWritten = sftp_write(file, lastChunk.data(), lastChunkSize);
 
                     if (bytesWritten != lastChunkSize) {
                         fin.close();
diff --git a/client/core/sshclient.h b/client/core/sshclient.h
index 4e08faaa..74c3b724 100644
--- a/client/core/sshclient.h
+++ b/client/core/sshclient.h
@@ -33,9 +33,9 @@ namespace libssh {
                                  const std::function<ErrorCode (const QString &, Client &)> &cbReadStdErr);
         ErrorCode writeResponse(const QString &data);
         ErrorCode sftpFileCopy(const SftpOverwriteMode overwriteMode,
-                               const std::string& localPath,
-                               const std::string& remotePath,
-                               const std::string& fileDesc);
+                               const QString &localPath,
+                               const QString &remotePath,
+                               const QString& fileDesc);
         ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback);
     private:
         ErrorCode closeChannel();