diff --git a/modules/video_coding/utility/simulcast_rate_allocator.cc b/modules/video_coding/utility/simulcast_rate_allocator.cc
index 8cc58138c2..ced01a7713 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator.cc
+++ b/modules/video_coding/utility/simulcast_rate_allocator.cc
@@ -212,7 +212,8 @@ void SimulcastRateAllocator::DistributeAllocationToTemporalLayers(
     const bool conference_screenshare_mode =
         codec_.mode == VideoCodecMode::kScreensharing &&
         ((num_spatial_streams == 1 && num_temporal_streams == 2) ||  // Legacy.
-         (num_spatial_streams > 1 && simulcast_id == 0));  // Simulcast.
+         (num_spatial_streams > 1 && simulcast_id == 0 &&
+          num_temporal_streams == 2));  // Simulcast.
     if (conference_screenshare_mode) {
       // TODO(holmer): This is a "temporary" hack for screensharing, where we
       // interpret the startBitrate as the encoder target bitrate. This is
diff --git a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
index 471fcd0d60..d2918fb923 100644
--- a/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
+++ b/modules/video_coding/utility/simulcast_rate_allocator_unittest.cc
@@ -507,6 +507,22 @@ TEST_F(SimulcastRateAllocatorTest, ThreeStreamsMiddleInactive) {
   }
 }
 
+TEST_F(SimulcastRateAllocatorTest, NonConferenceModeScreenshare) {
+  codec_.mode = VideoCodecMode::kScreensharing;
+  SetupCodec3SL3TL({true, true, true});
+  CreateAllocator();
+
+  // Make sure we have enough bitrate for all 3 simulcast layers
+  const uint32_t bitrate = codec_.simulcastStream[0].maxBitrate +
+                           codec_.simulcastStream[1].maxBitrate +
+                           codec_.simulcastStream[2].maxBitrate;
+  const VideoBitrateAllocation alloc = GetAllocation(bitrate);
+
+  EXPECT_EQ(alloc.GetTemporalLayerAllocation(0).size(), 3u);
+  EXPECT_EQ(alloc.GetTemporalLayerAllocation(1).size(), 3u);
+  EXPECT_EQ(alloc.GetTemporalLayerAllocation(2).size(), 3u);
+}
+
 class ScreenshareRateAllocationTest : public SimulcastRateAllocatorTest {
  public:
   void SetupConferenceScreenshare(bool use_simulcast, bool active = true) {