diff --git a/seahub/scripts/create_data_links.sh b/seahub/scripts/create_data_links.sh
index 0ae9016..c46495d 100644
--- a/seahub/scripts/create_data_links.sh
+++ b/seahub/scripts/create_data_links.sh
@@ -18,6 +18,11 @@ if [[ $TIME_ZONE != "" ]]; then
     fi
 fi
 
+while [[ ! -e /shared/seafile/conf || ! -e /shared/seafile/ccnet || ! -e /shared/seafile/seafile-data || ! -e /shared/seafile/seahub-data ]]; do
+        echo "Waiting for initialization by seafile-server..."
+        sleep 5
+done
+
 dirs=(
     conf
     ccnet
@@ -34,14 +39,14 @@ for d in ${dirs[*]}; do
     fi
 done
 
-if [[ ! -e /shared/seafile/conf/seahub.conf ]]; then
-    mv /opt/seafile/seafile-server-latest/runtime/seahub.conf /shared/seafile/conf/seahub.conf
-fi
-
-rm -f /opt/seafile/seafile-server-latest/runtime/seahub.conf
-ln -sf /shared/seafile/conf/seahub.conf /opt/seafile/seafile-server-latest/runtime/seahub.conf
-ln -sf /shared/seafile/seahub-data /opt/seafile/seafile-server-latest/seahub-data
+#ln -sf /shared/seafile/seahub-data /opt/seafile/seafile-server-latest/seahub-data
 rm -rf /opt/seafile/seafile-server-latest/seahub/media/avatars
 rm -rf /opt/seafile/seafile-server-latest/seahub/media/custom
 ln -sf /shared/seafile/seahub-data/avatars /opt/seafile/seafile-server-latest/seahub/media
-ln -sf /shared/seafile/seahub-data/custom /opt/seafile/seafile-server-latest/seahub/media
\ No newline at end of file
+ln -sf /shared/seafile/seahub-data/custom /opt/seafile/seafile-server-latest/seahub/media
+
+if [[ ! -e /shared/seafile/conf/seahub.conf ]]; then
+    mv /opt/seafile/seafile-server-latest/runtime/seahub.conf /shared/seafile/conf/seahub.conf
+fi
+rm -f /opt/seafile/seafile-server-latest/runtime/seahub.conf
+ln -sf /shared/seafile/conf/seahub.conf /opt/seafile/seafile-server-latest/runtime/seahub.conf
\ No newline at end of file