diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php
index c85c76532..47fba62cd 100644
--- a/modules/cms/widgets/MediaManager.php
+++ b/modules/cms/widgets/MediaManager.php
@@ -963,6 +963,13 @@ class MediaManager extends WidgetBase
 
             $fileName = $uploadedFile->getClientOriginalName();
 
+            // If name of our uploadfile not latin
+            if (!$this->validateFileName($fileName)) {
+                $extension = $uploadedFile->getClientOriginalExtension();
+                $fileNameWithoutExt = str_replace($extension, "", $fileName);
+                $fileName = str_slug($fileNameWithoutExt, "-").'.'.$extension;    
+            }
+            
             // See mime type handling in the asset manager
 
             if (!$uploadedFile->isValid()) {
@@ -1177,4 +1184,4 @@ class MediaManager extends WidgetBase
             'folder' => $targetFolder
         ];
    }
-}
\ No newline at end of file
+}