diff --git a/dd-ctl b/dd-ctl
index 6c9fbec..cc6a356 100755
--- a/dd-ctl
+++ b/dd-ctl
@@ -254,7 +254,7 @@ build_compose(){
 			-f dd-apps/docker/redis/redis.yml \
 			-f dd-apps/docker/postgresql/postgresql.yml \
 			-f dd-apps/docker/mariadb/mariadb.yml \
-			-f dd-apps/docker/clamav/${CLAMAV_YML} \
+			-f "dd-apps/docker/clamav/${CLAMAV_YML}" \
 			-f dd-apps/docker/network.yml \
 			config > docker-compose.yml
 }
@@ -352,6 +352,12 @@ setup_nextcloud(){
 		php occ --no-warnings app:install files_antivirus
 		php occ --no-warnings app:enable files_antivirus
 		EOF
+	else
+		# Enforce disabled
+		docker exec -i -u www-data dd-apps-nextcloud-app sh -s <<-EOF
+		php occ --no-warnings app:install files_antivirus
+		php occ --no-warnings app:disable files_antivirus
+		EOF
 	fi
 
 	# Disable in Nextcloud