diff --git a/seahub/settings.py b/seahub/settings.py
index ee3419e83a..b269cb2947 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -205,6 +205,9 @@ ENABLE_MAKE_GROUP_PUBLIC = False
 # show or hide library 'download' button
 SHOW_REPO_DOWNLOAD_BUTTON = False
 
+# enable 'upload folder' or not
+ENABLE_UPLOAD_FOLDER = False
+
 # mininum length for password of encrypted library
 REPO_PASSWORD_MIN_LENGTH = 8
 
diff --git a/seahub/templates/repo.html b/seahub/templates/repo.html
index 52905ce10d..921deaea27 100644
--- a/seahub/templates/repo.html
+++ b/seahub/templates/repo.html
@@ -1170,6 +1170,7 @@ $('#upload-file').click(function () {
     $('#upload-file-dialog').modal();
 });
     {% else %}
+        {% if enable_upload_folder %}
     if ('webkitdirectory' in $('#upload-file input[type="file"]')[0]) {
         $('#upload-file').find('input').remove().end().addClass('cspt');
         $('#upload-menu .item').click(function() {
@@ -1201,6 +1202,7 @@ $('#upload-file').click(function () {
             closePopup($('#upload-menu'), $('#upload-file'));
         });
     }
+        {% endif %}
     {% endif %}
 {% endif %}
 
diff --git a/seahub/templates/snippets/repo_dir_data.html b/seahub/templates/snippets/repo_dir_data.html
index 9c81184dab..56b0d74271 100644
--- a/seahub/templates/snippets/repo_dir_data.html
+++ b/seahub/templates/snippets/repo_dir_data.html
@@ -22,6 +22,7 @@
                 <span class="icon-upload-alt"></span><span>{% trans "Upload"%}</span>
                 <input type="file" name="file" multiple />
             </div>
+                {% if enable_upload_folder %}
             <ul id="upload-menu" class="hide">
                 <li class="item">
                 <span>{% trans "Upload Files" %}</span>
@@ -32,6 +33,7 @@
                 <input type="file" name="file" multiple directory webkitdirectory />
                 </li>
             </ul>
+                {% endif %}
             {% endif %}
         {% endif %}
         <button id="add-new-dir" class="op-btn"><span class="icon-plus-sign-alt"></span>{% trans "New Directory"%}</button>
diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py
index 0b23fd097a..e28c63f9a9 100644
--- a/seahub/views/ajax.py
+++ b/seahub/views/ajax.py
@@ -290,6 +290,7 @@ def list_dir(request, repo_id):
         'more_start': more_start,
         'ENABLE_SUB_LIBRARY': settings.ENABLE_SUB_LIBRARY,
         "sub_lib_enabled": sub_lib_enabled,
+        "enable_upload_folder": settings.ENABLE_UPLOAD_FOLDER,
         'current_commit': head_commit,
         'info_commit': info_commit,
     }   
diff --git a/seahub/views/repo.py b/seahub/views/repo.py
index dbf0cf6934..fe9ef8381d 100644
--- a/seahub/views/repo.py
+++ b/seahub/views/repo.py
@@ -29,7 +29,8 @@ from seahub.utils import gen_file_upload_url, is_org_context, \
     get_fileserver_root, gen_dir_share_link, gen_shared_upload_link, \
     get_max_upload_file_size, new_merge_with_no_conflict, \
     get_commit_before_new_merge, user_traffic_over_limit
-from seahub.settings import ENABLE_SUB_LIBRARY, FORCE_SERVER_CRYPTO
+from seahub.settings import ENABLE_SUB_LIBRARY, FORCE_SERVER_CRYPTO, \
+    ENABLE_UPLOAD_FOLDER
 
 # Get an instance of a logger
 logger = logging.getLogger(__name__)
@@ -268,6 +269,7 @@ def render_repo(request, repo):
             'ENABLE_SUB_LIBRARY': ENABLE_SUB_LIBRARY,
             'server_crypto': server_crypto,
             "sub_lib_enabled": sub_lib_enabled,
+            "enable_upload_folder": ENABLE_UPLOAD_FOLDER,
             }, context_instance=RequestContext(request))
    
 @login_required