diff --git a/react-typescript/src/model/reducer/calculateQuality.ts b/react-typescript/src/model/reducer/calculateQuality.ts
index 27d77e67..25938e3c 100644
--- a/react-typescript/src/model/reducer/calculateQuality.ts
+++ b/react-typescript/src/model/reducer/calculateQuality.ts
@@ -28,14 +28,10 @@ function calculateQuality(state: TItem): number {
         }
     }
 
-    if(state.isConjured) {
+    if(state.isConjured || state.sellIn < 0) {
         degradeRate = 2;
     }
 
-    if(state.sellIn <= 0) {
-        return calculatedQuality;
-    }
-
     calculatedQuality = calculatedQuality - (qualityIdentifier * degradeRate);
 
     if(calculatedQuality > 50) {
diff --git a/react-typescript/src/model/reducer/calculateSellIn.ts b/react-typescript/src/model/reducer/calculateSellIn.ts
index 8ba2f44f..97c739b6 100644
--- a/react-typescript/src/model/reducer/calculateSellIn.ts
+++ b/react-typescript/src/model/reducer/calculateSellIn.ts
@@ -5,13 +5,7 @@ function updateSellIn (state: any): number {
         return calculatedSellIn;
     }
 
-    calculatedSellIn = calculatedSellIn - 1;
-
-    if(calculatedSellIn < 0) {
-        return 0;
-    }
-
-    return calculatedSellIn;
+    return calculatedSellIn - 1;
 }
 
 export default updateSellIn;
\ No newline at end of file