diff --git a/libpod/container_api.go b/libpod/container_api.go
index 52b7e145de..525183c751 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -581,11 +581,16 @@ func (c *Container) Wait(ctx context.Context) (int32, error) {
 // WaitForExit blocks until the container exits and returns its exit code. The
 // argument is the interval at which checks the container's status.
 func (c *Container) WaitForExit(ctx context.Context, pollInterval time.Duration) (int32, error) {
+	id := c.ID()
 	if !c.valid {
+		// if the container is not valid at this point as it was deleted,
+		// check if the exit code was recorded in the db.
+		exitCode, err := c.runtime.state.GetContainerExitCode(id)
+		if err == nil {
+			return exitCode, nil
+		}
 		return -1, define.ErrCtrRemoved
 	}
-
-	id := c.ID()
 	var conmonTimer time.Timer
 	conmonTimerSet := false
 
@@ -767,7 +772,7 @@ func (c *Container) WaitForConditionWithInterval(ctx context.Context, waitTimeou
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-
+			stoppedCount := 0
 			for {
 				if len(wantedStates) > 0 {
 					state, err := c.State()
@@ -784,10 +789,17 @@ func (c *Container) WaitForConditionWithInterval(ctx context.Context, waitTimeou
 					// even if we are interested only in the health check
 					// check that the container is still running to avoid
 					// waiting until the timeout expires.
-					state, err := c.State()
-					if err != nil {
-						trySend(-1, err)
-						return
+					if stoppedCount > 0 {
+						stoppedCount++
+					} else {
+						state, err := c.State()
+						if err != nil {
+							trySend(-1, err)
+							return
+						}
+						if state != define.ContainerStateCreated && state != define.ContainerStateRunning && state != define.ContainerStatePaused {
+							stoppedCount++
+						}
 					}
 					status, err := c.HealthCheckStatus()
 					if err != nil {
@@ -798,7 +810,9 @@ func (c *Container) WaitForConditionWithInterval(ctx context.Context, waitTimeou
 						trySend(-1, nil)
 						return
 					}
-					if state != define.ContainerStateCreated && state != define.ContainerStateRunning && state != define.ContainerStatePaused {
+					// wait for another waitTimeout interval to give the health check process some time
+					// to record the healthy status.
+					if stoppedCount > 1 {
 						trySend(-1, define.ErrCtrStopped)
 						return
 					}
diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats
index 11629d2c7e..315fdc2fed 100644
--- a/test/system/260-sdnotify.bats
+++ b/test/system/260-sdnotify.bats
@@ -234,13 +234,22 @@ READY=1" "Container log after healthcheck run"
 
     run_podman rm -f -t0 $ctr
 
-    ctr=$(random_string)
-    run_podman run --name $ctr                       \
-            --health-cmd="touch /terminate"          \
-            --sdnotify=healthy                       \
-            $IMAGE sh -c 'while test \! -e /terminate; do sleep 0.1; done; echo finished'
-    is "$output" "finished" "make sure container exited successfully"
-    run_podman rm -f -t0 $ctr
+    # Disable until the race condition /~https://github.com/containers/podman/issues/22760 is fixed
+    # ctr=$(random_string)
+    # run_podman run --name $ctr                       \
+    #         --health-cmd="touch /terminate"          \
+    #         --sdnotify=healthy                       \
+    #         $IMAGE sh -c 'while test \! -e /terminate; do sleep 0.1; done; echo finished'
+    # is "$output" "finished" "make sure container exited successfully"
+    # run_podman rm -f -t0 $ctr
+
+    # ctr=$(random_string)
+    # run_podman 12 run --name $ctr --rm               \
+    #         --health-cmd="touch /terminate"          \
+    #         --sdnotify=healthy                       \
+    #         $IMAGE sh -c 'while test \! -e /terminate; do sleep 0.1; done; echo finished; exit 12'
+    # is "$output" "finished" "make sure container exited"
+    # run_podman rm -f -t0 $ctr
 
     _stop_socat
 }