diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ed929d331e1d..88234b541b09 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5254,8 +5254,11 @@ int set_tracer_flag(struct trace_array *tr, u64 mask, int enabled)
 		}
 	}
 
-	if (mask == TRACE_ITER(COPY_MARKER))
+	if (mask == TRACE_ITER(COPY_MARKER)) {
 		update_marker_trace(tr, enabled);
+		/* update_marker_trace updates the tr->trace_flags */
+		return 0;
+	}
 
 	if (enabled)
 		tr->trace_flags |= mask;