diff --git a/teamspeak/rootfs/etc/cont-init.d/20-folders.sh b/teamspeak/rootfs/etc/cont-init.d/20-folders.sh
index c858fee74..891f4f005 100644
--- a/teamspeak/rootfs/etc/cont-init.d/20-folders.sh
+++ b/teamspeak/rootfs/etc/cont-init.d/20-folders.sh
@@ -5,7 +5,7 @@ LOCATION=$(bashio::config 'data_location')
 
 # Data remanence for /teamspeak/save
 if [ -d /teamspeak/save ]; then
-  cp -n /teamspeak/save/* "$LOCATION"/
+  cp -rn /teamspeak/save/* "$LOCATION"/
   rm -r /teamspeak/save
 fi
 mkdir -p "$LOCATION"
@@ -13,10 +13,11 @@ ln -sf "$LOCATION" /teamspeak/save
 
 # Data remanence for /data
 if [ -d /data ]; then
-  cp -n /data/* "$LOCATION"/
+  cp -rn /data/* "$LOCATION"/
   rm -r /data
 fi
 mkdir -p "$LOCATION"
+rm -r /data
 ln -sf "$LOCATION" /data
 
 # Persmissions