diff --git a/src/common/components/Timer.jsx b/src/common/components/Timer.jsx
index 6c0d354f7..917f847ea 100644
--- a/src/common/components/Timer.jsx
+++ b/src/common/components/Timer.jsx
@@ -70,8 +70,8 @@ function Timer({ startingAt, onFinish, autoRemove, variant, ...rest }) {
       <Text {...rest}>
         {autoRemove && timer?.months <= 0 ? null : `${timer?.months} ${timer?.months === 1 ? t('word-connector.month') : t('word-connector.months')} `}
         {autoRemove && timer?.days <= 0 ? null : `${timer?.days} ${timer?.days === 1 ? t('word-connector.day') : t('word-connector.days')} `}
-        {autoRemove && timer?.months > 0 || (timer?.hours <= 0 && timer?.days <= 0) ? null : `${timer?.hours} ${timer?.hours === 1 ? t('word-connector.hour') : t('word-connector.hours')} `}
-        {autoRemove && timer?.days > 0 || (timer?.minutes <= 0 && timer?.hours <= 0 && timer?.days <= 0) ? null : `${timer.minutes} ${timer?.minutes === 1 ? t('word-connector.minute') : t('word-connector.minutes')} `}
+        {(autoRemove && timer?.hours <= 0 && timer?.days <= 0) || timer?.months > 0 ? null : `${timer?.hours} ${timer?.hours === 1 ? t('word-connector.hour') : t('word-connector.hours')} `}
+        {(autoRemove && timer?.minutes <= 0 && timer?.hours <= 0 && timer?.days <= 0) || timer?.days > 0 ? null : `${timer.minutes} ${timer?.minutes === 1 ? t('word-connector.minute') : t('word-connector.minutes')} `}
         {timer?.hours <= 0 && `${timer.seconds} ${t('word-connector.seconds')}`}
       </Text>
     );