diff --git a/quic/api/test/QuicPacketSchedulerTest.cpp b/quic/api/test/QuicPacketSchedulerTest.cpp
index 4a361c8e0..0ac7e1013 100644
--- a/quic/api/test/QuicPacketSchedulerTest.cpp
+++ b/quic/api/test/QuicPacketSchedulerTest.cpp
@@ -1217,7 +1217,10 @@ TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerAllFit) {
       folly::IOBuf::copyBuffer("some data"),
       false);
   scheduler.writeStreams(builder);
-  EXPECT_EQ(conn.streamManager->writableStreams().getNextScheduledStream(), 0);
+  EXPECT_EQ(
+      conn.streamManager->writableStreams().getNextScheduledStream(
+          kDefaultPriority),
+      0);
 }
 
 TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerRoundRobin) {
@@ -1262,7 +1265,10 @@ TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerRoundRobin) {
       false);
   // Force the wraparound initially.
   scheduler.writeStreams(builder);
-  EXPECT_EQ(conn.streamManager->writableStreams().getNextScheduledStream(), 4);
+  EXPECT_EQ(
+      conn.streamManager->writableStreams().getNextScheduledStream(
+          kDefaultPriority),
+      4);
 
   // Should write frames for stream2, stream3, followed by stream1 again.
   NiceMock<MockQuicPacketBuilder> builder2;
@@ -1327,7 +1333,9 @@ TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerRoundRobinStreamPerPacket) {
   // The default is to wraparound initially.
   scheduler.writeStreams(builder1);
   EXPECT_EQ(
-      conn.streamManager->writableStreams().getNextScheduledStream(), stream2);
+      conn.streamManager->writableStreams().getNextScheduledStream(
+          kDefaultPriority),
+      stream2);
 
   // Should write frames for stream2, stream3, followed by stream1 again.
   NiceMock<MockQuicPacketBuilder> builder2;
@@ -1475,7 +1483,9 @@ TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerRoundRobinControl) {
   // The default is to wraparound initially.
   scheduler.writeStreams(builder);
   EXPECT_EQ(
-      conn.streamManager->writableStreams().getNextScheduledStream(), stream3);
+      conn.streamManager->writableStreams().getNextScheduledStream(
+          kDefaultPriority),
+      stream3);
   EXPECT_EQ(conn.schedulingState.nextScheduledControlStream, stream2);
 
   // Should write frames for stream2, stream4, followed by stream 3 then 1.
@@ -1501,7 +1511,9 @@ TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerRoundRobinControl) {
   EXPECT_EQ(*frames[3].asWriteStreamFrame(), f4);
 
   EXPECT_EQ(
-      conn.streamManager->writableStreams().getNextScheduledStream(), stream3);
+      conn.streamManager->writableStreams().getNextScheduledStream(
+          kDefaultPriority),
+      stream3);
   EXPECT_EQ(conn.schedulingState.nextScheduledControlStream, stream2);
 }
 
@@ -1525,7 +1537,10 @@ TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerOneStream) {
   auto stream1 = conn.streamManager->createNextBidirectionalStream().value();
   writeDataToQuicStream(*stream1, folly::IOBuf::copyBuffer("some data"), false);
   scheduler.writeStreams(builder);
-  EXPECT_EQ(conn.streamManager->writableStreams().getNextScheduledStream(), 0);
+  EXPECT_EQ(
+      conn.streamManager->writableStreams().getNextScheduledStream(
+          kDefaultPriority),
+      0);
 }
 
 TEST_F(QuicPacketSchedulerTest, StreamFrameSchedulerRemoveOne) {
diff --git a/quic/state/QuicPriorityQueue.h b/quic/state/QuicPriorityQueue.h
index 7fc6e5d17..2159c9979 100644
--- a/quic/state/QuicPriorityQueue.h
+++ b/quic/state/QuicPriorityQueue.h
@@ -185,14 +185,14 @@ struct PriorityQueue {
    * This is a no-op if the stream doesn't exist, or its priority is the same as
    * the input.
    */
-  void updateIfExist(StreamId id, Priority priority = kDefaultPriority) {
+  void updateIfExist(StreamId id, Priority priority) {
     auto iter = writableStreamsToLevel_.find(id);
     if (iter != writableStreamsToLevel_.end()) {
       updateExistingStreamPriority(iter, priority);
     }
   }
 
-  void insertOrUpdate(StreamId id, Priority pri = kDefaultPriority) {
+  void insertOrUpdate(StreamId id, Priority pri) {
     auto it = writableStreamsToLevel_.find(id);
     auto index = priority2index(pri);
     if (it != writableStreamsToLevel_.end()) {
@@ -242,14 +242,13 @@ struct PriorityQueue {
   }
 
   // Only used for testing
-  void prepareIterator(Priority pri = kDefaultPriority) {
+  void prepareIterator(Priority pri) {
     auto& level = levels[priority2index(pri)];
     level.iterator->begin();
   }
 
   // Only used for testing
-  FOLLY_NODISCARD StreamId
-  getNextScheduledStream(Priority pri = kDefaultPriority) const {
+  FOLLY_NODISCARD StreamId getNextScheduledStream(Priority pri) const {
     auto& level = levels[priority2index(pri)];
     if (!level.incremental ||
         level.iterator->nextStreamIt == level.streams.end()) {
diff --git a/quic/state/test/QuicPriorityQueueTest.cpp b/quic/state/test/QuicPriorityQueueTest.cpp
index 73027624f..08844552c 100644
--- a/quic/state/test/QuicPriorityQueueTest.cpp
+++ b/quic/state/test/QuicPriorityQueueTest.cpp
@@ -205,7 +205,7 @@ TEST_F(QuicPriorityQueueTest, TestUpdate) {
 }
 
 TEST_F(QuicPriorityQueueTest, UpdateIfExist) {
-  queue_.updateIfExist(0);
+  queue_.updateIfExist(0, kDefaultPriority);
   EXPECT_EQ(0, queue_.count(0));
 
   queue_.insertOrUpdate(0, Priority(0, false));