diff --git a/seahub/settings.py b/seahub/settings.py
index b023b76115..01a36cacfc 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -412,7 +412,11 @@ SEAFILE_VERSION = '3.0.0'
 ENABLE_THUMBNAIL = True
 
 # Absolute filesystem path to the directory that will hold thumbnail files.
-THUMBNAIL_ROOT = os.path.join(PROJECT_ROOT, 'seahub/thumbnail/thumb')
+SEAHUB_DATA_ROOT = os.path.join(PROJECT_ROOT, '../../seahub-data')
+if os.path.exists(SEAHUB_DATA_ROOT):
+    THUMBNAIL_ROOT = os.path.join(SEAHUB_DATA_ROOT, 'thumbnail')
+else:
+    THUMBNAIL_ROOT = os.path.join(PROJECT_ROOT, 'seahub/thumbnail/thumb')
 
 THUMBNAIL_EXTENSION = 'png'
 THUMBNAIL_DEFAULT_SIZE = '24'
diff --git a/seahub/thumbnail/utils.py b/seahub/thumbnail/utils.py
index 3c0b1b0229..69518f6f42 100644
--- a/seahub/thumbnail/utils.py
+++ b/seahub/thumbnail/utils.py
@@ -2,4 +2,4 @@ import posixpath
 from seahub.utils import get_service_url
 def get_thumbnail_src(repo_id, obj_id, size):
     return posixpath.join(get_service_url(), "thumbnail", repo_id,
-                          obj_id, size)
+                          obj_id, size) + "/"