diff --git a/packages/hms-video-store/src/media/tracks/HMSRemoteVideoTrack.ts b/packages/hms-video-store/src/media/tracks/HMSRemoteVideoTrack.ts
index 841f4fc378..abff98bb41 100644
--- a/packages/hms-video-store/src/media/tracks/HMSRemoteVideoTrack.ts
+++ b/packages/hms-video-store/src/media/tracks/HMSRemoteVideoTrack.ts
@@ -148,10 +148,7 @@ export class HMSRemoteVideoTrack extends HMSVideoTrack {
    * @returns {boolean} isDegraded - returns true if degraded
    * */
   setLayerFromServer(layerUpdate: VideoTrackLayerUpdate) {
-    this._degraded =
-      this.enabled &&
-      (layerUpdate.publisher_degraded || layerUpdate.subscriber_degraded) &&
-      layerUpdate.current_layer === HMSSimulcastLayer.NONE;
+    this._degraded = this.getDegradationValue(layerUpdate);
     this._degradedAt = this._degraded ? new Date() : this._degradedAt;
     const currentLayer = layerUpdate.current_layer;
     HMSLogger.d(
@@ -171,11 +168,22 @@ export class HMSRemoteVideoTrack extends HMSVideoTrack {
     return this._degraded;
   }
 
+  private getDegradationValue(layerUpdate: VideoTrackLayerUpdate) {
+    return (
+      this.enabled &&
+      (layerUpdate.publisher_degraded || layerUpdate.subscriber_degraded) &&
+      layerUpdate.current_layer === HMSSimulcastLayer.NONE
+    );
+  }
+
   private async updateLayer(source: string) {
-    const newLayer =
-      (this.degraded || !this.enabled || !this.hasSinks()) && !this.disableNoneLayerRequest
-        ? HMSSimulcastLayer.NONE
-        : this.preferredLayer;
+    let newLayer: HMSSimulcastLayer = this.preferredLayer;
+    if (this.enabled && this.hasSinks()) {
+      newLayer = this.preferredLayer;
+      // send none only when the flag is not set
+    } else if (!this.disableNoneLayerRequest) {
+      newLayer = HMSSimulcastLayer.NONE;
+    }
     if (!this.shouldSendVideoLayer(newLayer, source)) {
       return;
     }