diff --git a/plex/root/etc/cont-init.d/21-folders b/plex/root/etc/cont-init.d/21-folders
index 9c392027f..afb2a6707 100644
--- a/plex/root/etc/cont-init.d/21-folders
+++ b/plex/root/etc/cont-init.d/21-folders
@@ -4,11 +4,23 @@
 # SYMLINK CONFIG #
 ##################
 
+echo "Database stored in /share/plex"
+
 if [ ! -d "/share/plex/Plex Media Server" ]; then
+echo "... creating /share/plex/Plex Media Server"
 mkdir -p "/share/plex/Plex Media Server"
 fi
 
-echo "Database stored in /share/plex"
+if [ -d "/config/Library/Application Support/Plex Media Server" ]; then
+  echo "... creating /symlink"
+  rm -r "/config/Library/Application Support/*"
+  ln -s "/share/plex/Plex Media Server" "/config/Library/Application Support"
+fi
+
+if [ ! -d "/config/Library/Application Support" ]; then
+  echo "... creating /symlink"
+  mkdir -p "/config/Library/Application Support"
+  ln -s "/share/plex/Plex Media Server" "/config/Library/Application Support"
+fi
+
 chown -R abc:abc /share/plex
-rm -r "/config/Library/Application Support/Plex Media Server"
-ln -s "/share/plex/Plex Media Server" "/config/Library/Application Support"