diff --git a/pkg/channels/manager.go b/pkg/channels/manager.go
index 802529dff..ff3fa399c 100644
--- a/pkg/channels/manager.go
+++ b/pkg/channels/manager.go
@@ -269,8 +269,11 @@ type finalizeHookStreamer struct {
 }
 
 func (s *finalizeHookStreamer) Finalize(ctx context.Context, content string) error {
+	if err := s.Streamer.Finalize(ctx, content); err != nil {
+		return err
+	}
 	s.onFinalize()
-	return s.Streamer.Finalize(ctx, content)
+	return nil
 }
 
 // initChannel is a helper that looks up a factory by name and creates the channel.