diff --git a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
index f16a77d2591c1e954071a6f49c06353a05d6b15e..2e18e93c39aa186eb63cc0025bc090bb4f73406a 100644
--- a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
+++ b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
@@ -76,6 +76,11 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
                     if (!fileInputLoaded) {
                         $(oInput).change(function(e){
 
+                            // Vide la liste quand on est pas en mode multiple
+                            if (scope['field']['multiple'] !== true) {
+                                scope['aFiles'] = [];
+                            }
+
                             // Ajoute les fichiers
                             scope['addFiles'](e);
 
@@ -94,6 +99,11 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
 
                     // Affiche les images présentes sur le serveur
                     var aAvaliableFiles = scope["oFormValues"][scope["sFormDefinitionName"]][scope['field'].name];
+                    if (scope['field']['multiple'] !== true) {
+                        if (goog.isString(aAvaliableFiles)) {
+                            aAvaliableFiles = [aAvaliableFiles];
+                        }
+                    }
                     if (goog.isDefAndNotNull(aAvaliableFiles)) {
                         scope['addFilesFromURL'](aAvaliableFiles).then(function(){
 
@@ -296,6 +306,11 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
                 return sName;
             }
 
+            /**
+             * Fonction pour télécharger les documents de type non image
+             *
+             * @param  {object} oFile
+             */
             scope['downloadDocument'] = function(oFile) {
                 $log.log("formReader.FilePickerDirective.downloadDocument");