diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index e301319781..15805f3f5f 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -455,7 +455,7 @@ public function putFile($fileId,
 				}
 				$file = $file[0];
 				$suggested = $this->request->getHeader('X-WOPI-SuggestedTarget');
-				$suggested = iconv('utf-7', 'utf-8', $suggested);
+				$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7');
 
 				if ($suggested[0] === '.') {
 					$path = dirname($file->getPath()) . '/New File' . $suggested;
@@ -575,7 +575,7 @@ public function putRelativeFile($fileId,
 
 				$suggested = $this->request->getHeader('X-WOPI-RequestedName');
 
-				$suggested = iconv('utf-7', 'utf-8', $suggested) . '.' . $file->getExtension();
+				$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7') . '.' . $file->getExtension();
 
 				if (strpos($suggested, '.') === 0) {
 					$path = dirname($file->getPath()) . '/New File' . $suggested;
@@ -610,7 +610,7 @@ public function putRelativeFile($fileId,
 				$file = $file[0];
 
 				$suggested = $this->request->getHeader('X-WOPI-SuggestedTarget');
-				$suggested = iconv('utf-7', 'utf-8', $suggested);
+				$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7');
 
 				if ($suggested[0] === '.') {
 					$path = dirname($file->getPath()) . '/New File' . $suggested;