diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index ec4f494f8..ac25f6a77 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -19,7 +19,7 @@ class HealthChecks extends Component
     #[Validate(['string', 'in:http,cmd'])]
     public string $healthCheckType = 'http';
 
-    #[Validate(['nullable', 'string'])]
+    #[Validate(['nullable', 'required_if:healthCheckType,cmd', 'string'])]
     public ?string $healthCheckCommand = null;
 
     #[Validate(['string'])]
@@ -128,6 +128,7 @@ public function syncData(bool $toModel = false): void
     public function instantSave()
     {
         $this->authorize('update', $this->resource);
+        $this->validate();
 
         // Sync component properties to model
         $this->resource->health_check_enabled = $this->healthCheckEnabled;
diff --git a/resources/views/livewire/project/shared/health-checks.blade.php b/resources/views/livewire/project/shared/health-checks.blade.php
index a0027c62c..c181f3f1a 100644
--- a/resources/views/livewire/project/shared/health-checks.blade.php
+++ b/resources/views/livewire/project/shared/health-checks.blade.php
@@ -57,7 +57,7 @@
                     label="Command"
                     placeholder="Example: pg_isready -U postgres
Example: redis-cli ping
Example: curl -f http://localhost:8080/health"
                     helper="The command to run inside the container. It should exit with code 0 on success and non-zero on failure."
-                    required />
+                    :required="$healthCheckType === 'cmd'" />
             </div>
         @endif