diff --git a/webtrees/rootfs/etc/cont-init.d/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh
index f7d996f30..d18079198 100755
--- a/webtrees/rootfs/etc/cont-init.d/99-run.sh
+++ b/webtrees/rootfs/etc/cont-init.d/99-run.sh
@@ -58,6 +58,12 @@ chmod -R 755 "$DATA_LOCATION"
 chown -R www-data:www-data "/config"
 chmod -R 755 "/config"
 
+# Remove /data/data
+if [[ -d "$DATA_LOCATION"/data ]] && [[ "$(ls -A "$DATA_LOCATION"/data/*)" ]]; then
+  mv "$DATA_LOCATION"/data/* "$DATA_LOCATION"/
+  rm -r "$DATA_LOCATION"/data
+fi
+
 ################
 # SSL CONFIG   #
 ################