diff --git a/Form/JQuery/Type/FileType.php b/Form/JQuery/Type/FileType.php
index d2d5eb26..90e4c920 100644
--- a/Form/JQuery/Type/FileType.php
+++ b/Form/JQuery/Type/FileType.php
@@ -83,7 +83,12 @@ public function buildView(FormView $view, FormInterface $form)
                         $data = new File($form->getAttribute('rootDir') . '/' . $data);
                     }
 
-                    $value[] = $configs['folder'] . '/' . $data->getFilename();
+                    if ($configs['custom_storage_folder']){
+                        $value[] = $form->getClientData();
+                    }else{
+                        $value[] = $configs['folder'] . '/' . $data->getFilename();
+                    }
+
                 }
 
                 $value = implode(',', $value);
@@ -92,7 +97,12 @@ public function buildView(FormView $view, FormInterface $form)
                     $datas = new File($form->getAttribute('rootDir') . '/' . $datas);
                 }
 
-                $value = $configs['folder'] . '/' . $datas->getFilename();
+                if ($configs['custom_storage_folder']){
+                   $value[] = $form->getClientData();
+                }else{
+                   $value[] = $configs['folder'] . '/' . $datas->getFilename();
+                }
+
             }
 
             $view->set('value', $value);