diff --git a/internal/controller/buildpipeline/buildpipeline_adapter.go b/internal/controller/buildpipeline/buildpipeline_adapter.go
index d7568da6a..887f5273b 100644
--- a/internal/controller/buildpipeline/buildpipeline_adapter.go
+++ b/internal/controller/buildpipeline/buildpipeline_adapter.go
@@ -111,8 +111,7 @@ func (a *Adapter) EnsureSnapshotExists() (result controller.OperationResult, err
 
 	expectedSnapshot, err := a.prepareSnapshotForPipelineRun(a.pipelineRun, a.component, a.application)
 	if err != nil {
-		result, err = a.updatePipelineRunWithCustomizedError(&canRemoveFinalizer, err, a.context, a.pipelineRun, a.client, a.logger)
-		return controller.RequeueWithError(err)
+		return a.updatePipelineRunWithCustomizedError(&canRemoveFinalizer, err, a.context, a.pipelineRun, a.client, a.logger)
 	}
 
 	err = a.client.Create(a.context, expectedSnapshot)
@@ -361,7 +360,7 @@ func (a *Adapter) updatePipelineRunWithCustomizedError(canRemoveFinalizer *bool,
 		}
 		logger.Error(cerr, "Build PipelineRun failed with error, should be fixed and re-run manually", "pipelineRun.Name", pipelineRun.Name)
 		*canRemoveFinalizer = true
-		return controller.ContinueProcessing()
+		return controller.StopProcessing()
 	}
 	return controller.RequeueOnErrorOrContinue(cerr)
 
diff --git a/internal/controller/buildpipeline/buildpipeline_adapter_test.go b/internal/controller/buildpipeline/buildpipeline_adapter_test.go
index 2b36a0365..99bcd5faa 100644
--- a/internal/controller/buildpipeline/buildpipeline_adapter_test.go
+++ b/internal/controller/buildpipeline/buildpipeline_adapter_test.go
@@ -662,7 +662,7 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 			Expect(helpers.IsInvalidImageDigestError(err)).To(BeTrue())
 			Eventually(func() bool {
 				result, err := adapter.EnsureSnapshotExists()
-				return !result.CancelRequest && err == nil
+				return result.CancelRequest && err == nil
 			}, time.Second*10).Should(BeTrue())
 			Expect(adapter.pipelineRun.GetAnnotations()[helpers.CreateSnapshotAnnotationName]).ToNot(BeNil())
 			var info map[string]string
@@ -1005,7 +1005,7 @@ var _ = Describe("Pipeline Adapter", Ordered, func() {
 
 				Eventually(func() bool {
 					result, err := adapter.EnsureSnapshotExists()
-					return !result.CancelRequest && err == nil
+					return result.CancelRequest && err == nil
 				}, time.Second*10).Should(BeTrue())
 				// Ensure the PLR on the control plane does not have finalizer
 				Eventually(func() bool {