diff --git a/src/freedombone b/src/freedombone
index 78920924..de2b83dc 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -9998,7 +9998,11 @@ function install_media_server {
 	sed -i 's|files_serve_method.*|files_serve_method = nginx_redirect|g' deployment.ini
 
 	# initial data
-	cp -a data .
+	if [ ! -d $MEDIA_SERVER_WORKING_DIRECTORY/data ]; then
+		echo $'No data directory found'
+		exit 625728
+	fi
+	cp -a $MEDIA_SERVER_WORKING_DIRECTORY/data $MEDIA_SERVER_WORKING_DIRECTORY
 	paster setup-app deployment.ini
 
 	# add uwsgi to deployment.ini