diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js
index ae79d223dd0f2d2d4083a292d58c70bdd6f94426..92e517b0e060d8b1086b5dc90987e3a1b0f6d529 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/js/openbis.js
@@ -318,6 +318,13 @@ openbis.prototype.executeQuery = function(queryId, parameterBindings, action) {
 }
 
 openbis.prototype.createSessionWorkspaceUploader = function(uploaderContainer){
+	var uploaderSupported = window.File && window.FileReader && window.XMLHttpRequest;
+
+	if(!uploaderSupported){
+		alert("Uploader is not supported by your browser.");
+		return;
+	}
+	
 	var $this = this;
 	
 	$('head').append('<link rel="stylesheet" media="screen" type="text/css" href="../uploader/css/src/upload.css" />');