diff --git a/plex/rootfs/etc/cont-init.d/21-folders.sh b/plex/rootfs/etc/cont-init.d/21-folders.sh
index 07ec6d70a..20f2a1636 100755
--- a/plex/rootfs/etc/cont-init.d/21-folders.sh
+++ b/plex/rootfs/etc/cont-init.d/21-folders.sh
@@ -25,11 +25,13 @@ fi
 
 # Adapt permissions if needed
 if ! bashio::config.true "skip_permissions_check" && [ "${PUID:-0}" != "0" ] && [ "${PGID:-0}" != "0" ]; then
+    echo "... setting permissions"
     chown -R "$PUID:$PGID" /share/plex
     chmod -R 777 /share/plex
 fi
 
 # Clear Codecs folder if checked
-if ! bashio::config.true "clear_codecs_folder"; then
-    rm -rf /share/plex/Plex\ Media\ Server/Codecs
+if bashio::config.true "clear_codecs_folder" && [[ -d "/share/plex/Plex Media Server/Codecs" ]]; then
+    echo "... deleting codecs folder"
+    rm -r "/share/plex/Plex Media Server/Codecs"
 fi