diff --git a/packit_service/worker/helpers/build/babysit.py b/packit_service/worker/helpers/build/babysit.py
index 28374c209..43db9524a 100644
--- a/packit_service/worker/helpers/build/babysit.py
+++ b/packit_service/worker/helpers/build/babysit.py
@@ -291,17 +291,16 @@ def update_copr_builds(
 
     logger.info(f"The status of {build_id} is {build_copr.state!r}.")
 
-    if (
-        srpm_build := SRPMBuildModel.get_by_copr_build_id(build_id)
-    ) and srpm_build.status == BuildStatus.pending:
+    if srpm_build := SRPMBuildModel.get_by_copr_build_id(build_id):
         try:
             build_copr_srpm = copr_client.build_proxy.get_source_chroot(build_id)
         except copr.v3.CoprNoResultException:
-            logger.info(
-                f"SRPM build of Copr build {build_id} no longer available. "
-                "Setting it to error status and not checking it anymore.",
-            )
-            srpm_build.set_status(BuildStatus.error)
+            if srpm_build.status == BuildStatus.pending:
+                logger.info(
+                    f"SRPM build of Copr build {build_id} no longer available. "
+                    "Setting it to error status and not checking it anymore.",
+                )
+                srpm_build.set_status(BuildStatus.error)
         else:
             try:
                 update_srpm_build_state(srpm_build, build_copr, build_copr_srpm)
diff --git a/tests/integration/test_babysit.py b/tests/integration/test_babysit.py
index d0cc98fd4..b9c168c96 100644
--- a/tests/integration/test_babysit.py
+++ b/tests/integration/test_babysit.py
@@ -91,10 +91,117 @@ def test_check_copr_build_already_successful():
             .should_receive("get")
             .with_args(1)
             .and_return(flexmock(ended_on="timestamp", state="completed"))
+            .mock()
+            .should_receive("get_source_chroot")
+            .with_args(1)
+            .and_return(flexmock(state="succeeded"))
+            .mock(),
+        ),
+    )
+    # update_srpm_build_state is called but SRPM build already succeeded,
+    # so the handler dispatch is a safe idempotent operation
+    flexmock(packit_service.worker.helpers.build.babysit).should_receive(
+        "update_srpm_build_state",
+    ).once()
+    assert check_copr_build(build_id=1)
+
+
+def test_check_copr_build_srpm_status_check_dispatched_when_db_already_success(
+    add_pull_request_event_with_sha_123456,
+):
+    """When copr_build_end handlers update the SRPM build DB row to
+    success before babysit runs, babysit should still call
+    update_srpm_build_state to dispatch the SRPM status check.
+
+    Regression test for https://github.com/packit/packit-service/issues/3170
+    """
+    db_project_object, db_project_event = add_pull_request_event_with_sha_123456
+    srpm_build = flexmock(
+        copr_build_id="55",
+        status=BuildStatus.success,
+        commit_sha="123456",
+    )
+    flexmock(srpm_build).should_receive("get_project_event_object").and_return(
+        db_project_object,
+    )
+    flexmock(srpm_build).should_receive("get_project_event_model").and_return(
+        db_project_event,
+    )
+    flexmock(srpm_build).should_receive("get_package_name").and_return(None)
+
+    db_build = flexmock(
+        build_id="55",
+        status=BuildStatus.success,
+        submitted_time=datetime.datetime.utcnow(),
+        target="the-target",
+        owner="the-owner",
+        project_name="the-namespace-repo_name-5",
+        commit_sha="123456",
+    )
+
+    flexmock(CoprBuildTargetModel).should_receive("get_all_by_build_id").with_args(
+        1,
+    ).and_return([db_build])
+    flexmock(SRPMBuildModel).should_receive("get_by_copr_build_id").and_return(
+        srpm_build,
+    )
+    flexmock(CoprHelper).should_receive("get_copr_client").and_return(
+        Client(config={"username": "the-owner", "copr_url": "https://dummy.url"}),
+    )
+    flexmock(CoprBuildTargetModel).should_receive("get_by_build_id").and_return(
+        db_build,
+    )
+
+    build_copr = flexmock(
+        ended_on="timestamp",
+        started_on="timestamp",
+        state="succeeded",
+        ownername="the-owner",
+        projectname="the-namespace-repo_name-5",
+        source_package={
+            "name": "source_package_name",
+            "url": "https://some.host/my.srpm",
+        },
+    )
+    flexmock(Client).should_receive("create_from_config_file").and_return(
+        flexmock(
+            build_proxy=flexmock()
+            .should_receive("get")
+            .with_args(1)
+            .and_return(build_copr)
+            .mock()
+            .should_receive("get_source_chroot")
+            .with_args(1)
+            .and_return(flexmock(state="succeeded"))
             .mock(),
         ),
     )
+    flexmock(events.copr.CoprBuild).should_receive("get_packages_config").and_return(
+        PackageConfig(
+            jobs=[
+                JobConfig(
+                    type=JobType.copr_build,
+                    trigger=JobConfigTriggerType.pull_request,
+                    packages={"package": CommonPackageConfig(specfile_path="some.spec")},
+                ),
+            ],
+            packages={"package": CommonPackageConfig(specfile_path="some.spec")},
+        ),
+    )
+
+    # The key assertion: celery_run_async must be called to dispatch
+    # the CoprBuildEndHandler for the SRPM, even though the DB already
+    # shows success.
+    celery_run_async_called = []
+    flexmock(
+        packit_service.worker.helpers.build.babysit,
+        celery_run_async=lambda signatures: celery_run_async_called.append(signatures),
+    )
+
     assert check_copr_build(build_id=1)
+    assert len(celery_run_async_called) == 1, (
+        "Expected celery_run_async to be called once for the SRPM status check"
+    )
 
 
 def celery_run_async_stub(signatures, handlers) -> None: