diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
index 37edb07a1a..c1eb357bb9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java
@@ -203,7 +203,7 @@ public final class WavExtractor implements Extractor {
               /* id= */ null,
               MimeTypes.AUDIO_RAW,
               /* codecs= */ null,
-              /* bitrate= */ header.averageBytesPerSecond * 8,
+              /* bitrate= */ header.frameRateHz * bytesPerFrame * 8,
               targetSampleSize,
               header.numChannels,
               header.frameRateHz,
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java
index 53e0f45306..2a92c38431 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java
@@ -49,20 +49,18 @@ import com.google.android.exoplayer2.util.Util;
 
   @Override
   public SeekPoints getSeekPoints(long timeUs) {
-    // Calculate the expected number of bytes of sample data corresponding to the requested time.
-    long positionOffset = (timeUs * wavHeader.averageBytesPerSecond) / C.MICROS_PER_SECOND;
     // Calculate the containing block index, constraining to valid indices.
-    long blockSize = wavHeader.blockSize;
-    long blockIndex = Util.constrainValue(positionOffset / blockSize, 0, blockCount - 1);
+    long blockIndex = (timeUs * wavHeader.frameRateHz) / (C.MICROS_PER_SECOND * framesPerBlock);
+    blockIndex = Util.constrainValue(blockIndex, 0, blockCount - 1);
 
-    long seekPosition = firstBlockPosition + (blockIndex * blockSize);
+    long seekPosition = firstBlockPosition + (blockIndex * wavHeader.blockSize);
     long seekTimeUs = blockIndexToTimeUs(blockIndex);
     SeekPoint seekPoint = new SeekPoint(seekTimeUs, seekPosition);
     if (seekTimeUs >= timeUs || blockIndex == blockCount - 1) {
       return new SeekPoints(seekPoint);
     } else {
       long secondBlockIndex = blockIndex + 1;
-      long secondSeekPosition = firstBlockPosition + (secondBlockIndex * blockSize);
+      long secondSeekPosition = firstBlockPosition + (secondBlockIndex * wavHeader.blockSize);
       long secondSeekTimeUs = blockIndexToTimeUs(secondBlockIndex);
       SeekPoint secondSeekPoint = new SeekPoint(secondSeekTimeUs, secondSeekPosition);
       return new SeekPoints(seekPoint, secondSeekPoint);