diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index def1309190..9daedd6066 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -68,6 +68,8 @@
     *   Avoid throwing an exception while parsing fragmented MP4 default sample
         values where the most-significant bit is set
         ([#7207](https://github.com/google/ExoPlayer/issues/7207)).
+    *   Add `SilenceMediaSource.Factory` to support tags
+        ([PR #7245](https://github.com/google/ExoPlayer/pull/7245)).
 *   Text:
     *   Parse `<ruby>` and `<rt>` tags in WebVTT subtitles (rendering is coming
         later).
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
index 839f683cfa..f4fb376248 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SilenceMediaSource.java
@@ -33,6 +33,42 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
 /** Media source with a single period consisting of silent raw audio of a given duration. */
 public final class SilenceMediaSource extends BaseMediaSource {
 
+  /** Factory for {@link SilenceMediaSource SilenceMediaSources}. */
+  public static final class Factory {
+
+    private long durationUs;
+    @Nullable private Object tag;
+
+    /**
+     * Sets the duration of the silent audio.
+     *
+     * @param durationUs The duration of silent audio to output, in microseconds.
+     * @return This factory, for convenience.
+     */
+    public Factory setDurationUs(long durationUs) {
+      this.durationUs = durationUs;
+      return this;
+    }
+
+    /**
+     * Sets a tag for the media source which will be published in the {@link
+     * com.google.android.exoplayer2.Timeline} of the source as {@link
+     * com.google.android.exoplayer2.Timeline.Window#tag}.
+     *
+     * @param tag A tag for the media source.
+     * @return This factory, for convenience.
+     */
+    public Factory setTag(@Nullable Object tag) {
+      this.tag = tag;
+      return this;
+    }
+
+    /** Creates a new {@link SilenceMediaSource}. */
+    public SilenceMediaSource createMediaSource() {
+      return new SilenceMediaSource(durationUs, tag);
+    }
+  }
+
   private static final int SAMPLE_RATE_HZ = 44100;
   @C.PcmEncoding private static final int PCM_ENCODING = C.ENCODING_PCM_16BIT;
   private static final int CHANNEL_COUNT = 2;
@@ -47,6 +83,7 @@ public final class SilenceMediaSource extends BaseMediaSource {
       new byte[Util.getPcmFrameSize(PCM_ENCODING, CHANNEL_COUNT) * 1024];
 
   private final long durationUs;
+  @Nullable private final Object tag;
 
   /**
    * Creates a new media source providing silent audio of the given duration.
@@ -54,15 +91,25 @@ public final class SilenceMediaSource extends BaseMediaSource {
    * @param durationUs The duration of silent audio to output, in microseconds.
    */
   public SilenceMediaSource(long durationUs) {
+    this(durationUs, /* tag= */ null);
+  }
+
+  private SilenceMediaSource(long durationUs, @Nullable Object tag) {
     Assertions.checkArgument(durationUs >= 0);
     this.durationUs = durationUs;
+    this.tag = tag;
   }
 
   @Override
   protected void prepareSourceInternal(@Nullable TransferListener mediaTransferListener) {
     refreshSourceInfo(
         new SinglePeriodTimeline(
-            durationUs, /* isSeekable= */ true, /* isDynamic= */ false, /* isLive= */ false));
+            durationUs,
+            /* isSeekable= */ true,
+            /* isDynamic= */ false,
+            /* isLive= */ false,
+            /* manifest= */ null,
+            tag));
   }
 
   @Override