diff --git a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
index bb4a57a753..338f6145c0 100644
--- a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
+++ b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
@@ -66,15 +66,21 @@ export class FileDraggableDirective {
         this._preventDefault($event);
 
         let items = $event.dataTransfer.items;
-        for (let i = 0; i < items.length; i++) {
-            let item = items[i].webkitGetAsEntry();
-            if (item) {
-                this._traverseFileTree(item);
-            } else {
-                let dt = $event.dataTransfer;
-                let files = dt.files;
-                this.onFilesDropped.emit(files);
+        if (items) {
+            for (let i = 0; i < items.length; i++) {
+                let item = items[i].webkitGetAsEntry();
+                if (item) {
+                    this._traverseFileTree(item);
+                } else {
+                    let dt = $event.dataTransfer;
+                    let files = dt.files;
+                    this.onFilesDropped.emit(files);
+                }
             }
+        } else {
+            // safari or FF
+            let files = $event.dataTransfer.files;
+            this.onFilesDropped.emit(files);
         }
 
         this._inputFocusClass = false;