diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image
index cb058a7462..7c3b13fb4c 100755
--- a/build/scripts/build_haiku_image
+++ b/build/scripts/build_haiku_image
@@ -292,7 +292,7 @@ if [ -n "$updateAllPackages" ]; then
 	$mkdir -p "${tPrefix}system/packages"
 fi
 
-if [ ! $updateOnly ]; then
+if [ ! $updateOnly ] && [ ! $isCD ]; then
 echo "Creating filesystem indices..."
 	$mkindex -t string Audio:Album
 	$mkindex -t string Audio:Artist