diff --git a/organizr/rootfs/etc/cont-init.d/00-folders.sh b/organizr/rootfs/etc/cont-init.d/00-folders.sh
index 4316277b9..d7f770301 100755
--- a/organizr/rootfs/etc/cont-init.d/00-folders.sh
+++ b/organizr/rootfs/etc/cont-init.d/00-folders.sh
@@ -10,7 +10,7 @@ mkdir -p /data/organizr
 chown "$PUID:$PGID" /data/organizr
 
 # Only act if the symlink target does not exist
-if [[ ! -f /data/organizr/www/organizr/api/data/organizr/default.php ]]; then
+if [[ -d /data/organizr/www/organizr ]] && [[ ! -f /data/organizr/www/organizr/api/data/organizr/default.php ]]; then
     echo "Fix issues in upstream"
     mkdir -p /data/organizr/www/organizr/api/data/organizr
     if [[ -f /data/organizr/www/organizr/api/config/default.php ]]; then