diff --git a/package.json b/package.json
index 353e984..143219f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ghost-dao-interface",
   "private": true,
-  "version": "0.2.5",
+  "version": "0.2.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src/containers/Bond/components/ClaimBonds.jsx b/src/containers/Bond/components/ClaimBonds.jsx
index 48b6f03..dbf2122 100644
--- a/src/containers/Bond/components/ClaimBonds.jsx
+++ b/src/containers/Bond/components/ClaimBonds.jsx
@@ -59,7 +59,7 @@ export const ClaimBonds = ({ chainId, address, secondsTo }) => {
 
     const onSubmit = async (indexes) => {
         const isFundsInWarmup = warmupInfo.deposit._value > 0n;
-        if ((warmupExists && isFundsInWarmup) || !isPreClaimConfirmed) {
+        if (warmupExists && isFundsInWarmup && !isPreClaimConfirmed) {
             setIsWapmup(true);
         } else {
             setIsPending(true);
diff --git a/src/containers/Stake/components/StakeConfirmationModal.jsx b/src/containers/Stake/components/StakeConfirmationModal.jsx
index 749d9dc..9cf971b 100644
--- a/src/containers/Stake/components/StakeConfirmationModal.jsx
+++ b/src/containers/Stake/components/StakeConfirmationModal.jsx
@@ -84,7 +84,7 @@ const StakeConfirmationModal = (props) => {
                 );
                 break;
             case "UNSTAKE":
-                isRebase = props.upperToken === stnkSymbol;
+                isRebase = props.upperToken === props.stnkSymbol;
                 await unstake(
                     props.chainId,
                     props.address,