diff --git a/frontend/package.json b/frontend/package.json
index a3e90037f..db0a5c2db 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "ccscan-frontend",
 	"description": "CCDScan frontend",
-	"version": "1.5.21",
+	"version": "1.5.22",
 	"engine": "16",
 	"type": "module",
 	"private": true,
diff --git a/frontend/src/components/Staking/CommissionRates.vue b/frontend/src/components/Staking/CommissionRates.vue
index 4e5afdc51..b17499bee 100644
--- a/frontend/src/components/Staking/CommissionRates.vue
+++ b/frontend/src/components/Staking/CommissionRates.vue
@@ -1,21 +1,21 @@
 <template>
-	<Tooltip
+	<span
 		v-if="
-			props.nextPaydayCommission !== undefined &&
-			props.nextPaydayCommission !== null &&
-			props.nextPaydayCommission !== props.currentPaydayCommission
+			props.currentPaydayCommission === undefined ||
+			props.currentPaydayCommission === null
 		"
+		class="numerical"
+	>
+		{{ `${formatPercentage(props.nextPaydayCommission)}%` }}
+	</span>
+	<Tooltip
+		v-else-if="props.nextPaydayCommission !== props.currentPaydayCommission"
 		:text="`Rates will change to ${formatPercentage(
 			props.nextPaydayCommission
 		)}% on the next payday.`"
 	>
 		<span class="numerical change">
-			{{
-				props.currentPaydayCommission !== undefined &&
-				props.currentPaydayCommission !== null
-					? `${formatPercentage(props.currentPaydayCommission)}%`
-					: 'unknown'
-			}}
+			{{ `${formatPercentage(props.currentPaydayCommission)}%` }}
 			<ArrowUpIcon
 				v-if="
 					!props.currentPaydayCommission ||
@@ -28,12 +28,7 @@
 		</span>
 	</Tooltip>
 	<span v-else class="numerical">
-		{{
-			props.currentPaydayCommission !== undefined &&
-			props.currentPaydayCommission !== null
-				? `${formatPercentage(props.currentPaydayCommission)}%`
-				: 'unknown'
-		}}
+		{{ `${formatPercentage(props.currentPaydayCommission)}%` }}
 	</span>
 </template>
 <script lang="ts" setup>
@@ -45,7 +40,7 @@ import { formatPercentage } from '~/utils/format'
 
 type Props = {
 	currentPaydayCommission: number | null
-	nextPaydayCommission: number | null
+	nextPaydayCommission: number
 }
 const props = defineProps<Props>()
 </script>
diff --git a/frontend/src/components/atoms/Tooltip.vue b/frontend/src/components/atoms/Tooltip.vue
index c0d130faf..da67863e3 100644
--- a/frontend/src/components/atoms/Tooltip.vue
+++ b/frontend/src/components/atoms/Tooltip.vue
@@ -71,6 +71,10 @@ const handleOnMouseLeave = () => {
 	pointer-events: auto;
 	white-space: normal;
 	text-align: center;
+	width: 200px;
+	@media screen and (max-width: 640px) {
+		width: 150px;
+	}
 }
 
 /* Binding variables from a composable to a pseudo element does not work in Vue */