diff --git a/lang/ca.json b/lang/ca.json
index f5c58249ba..c55842172f 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -1294,7 +1294,7 @@
 	"page.donate.matching_toast.upper_valid": "Emparellament estimat",
 	"page.donate.passport_toast.description.eligible": "La teva donació és elegible per ser emparellada! Després del",
 	"page.donate.passport_toast.description.eligible_2": ", totes les donacions seran revisades per a la protecció contra frau i els fons d'emparellament seran enviats als projectes. Estigues atent a les notificacions :)",
-	"page.donate.passport_toast.description.non_eligible": "Obtén el teu emparellament de donació amb finançament quadràtic!\nAugmenta la teva puntuació de Gitcoin Passport abans de",
+	"page.donate.passport_toast.description.non_eligible": "Obtén el teu emparellament de donació amb finançament quadràtic!\nComproveu la vostra elegibilitat QF abans",
 	"page.donate.passport_toast.description.not_connected": "Obtén el teu emparellament de donació amb finançament quadràtic!\nVerifica el teu Gitcoin Passport abans de",
 	"page.donate.passport_toast.title.eligible": "Finançament Quadràtic",
 	"page.donate.passport_toast.title.non_eligible": "No et perdis l'emparellament!",
diff --git a/lang/en.json b/lang/en.json
index 4f81d535ef..e5c02cc5ba 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1295,7 +1295,7 @@
 	"page.donate.matching_toast.upper_valid": "Estimated matching",
 	"page.donate.passport_toast.description.eligible": "Your donation is eligible to be matched! After the",
 	"page.donate.passport_toast.description.eligible_2": ", all donations will be reviewed for fraud protection and matching funds will be sent to the projects.  Stay tuned for notifications :)",
-	"page.donate.passport_toast.description.non_eligible": "Get your donation matched with quadratic funding!\nIncrease your Gitcoin Passport score before",
+	"page.donate.passport_toast.description.non_eligible": "Get your donation matched with quadratic funding!\nCheck your QF Eligibility before",
 	"page.donate.passport_toast.description.not_connected": "Get your donation matched with quadratic funding!\nVerify your Gitcoin Passport before",
 	"page.donate.passport_toast.title.eligible": "Quadratic Funding",
 	"page.donate.passport_toast.title.non_eligible": "Don’t miss out on matching!",
diff --git a/lang/es.json b/lang/es.json
index 0846fe04fc..d9b39113b0 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1294,7 +1294,7 @@
 	"page.donate.matching_toast.upper_valid": "Estimado del monto complementado",
 	"page.donate.passport_toast.description.eligible": "¡Tu donación es elegible para ser complementada! Después de la",
 	"page.donate.passport_toast.description.eligible_2": ", todas las donaciones serán revisadas para protección contra fraudes y los fondos de complementarios se enviarán a los proyectos. ¡Mantente atento a las notificaciones! :)",
-	"page.donate.passport_toast.description.non_eligible": "¡Haz que tu donación sea complementada con financiamiento cuadrático! Aumenta tu puntaje de Gitcoin Passport antes de",
+	"page.donate.passport_toast.description.non_eligible": "¡Haz que tu donación sea complementada con financiamiento cuadrático!\nCompruebe su elegibilidad QF antes de",
 	"page.donate.passport_toast.description.not_connected": "¡Haz que tu donación sea complementada con financiamiento cuadrático! Verifica tu Gitcoin Passport antes de",
 	"page.donate.passport_toast.title.eligible": "Financiamiento Cuadrático",
 	"page.donate.passport_toast.title.non_eligible": "¡No te pierdas la oportunidad!",
diff --git a/src/components/modals/PassportModal.tsx b/src/components/modals/PassportModal.tsx
index fdeb08f1ec..8cb4822b57 100644
--- a/src/components/modals/PassportModal.tsx
+++ b/src/components/modals/PassportModal.tsx
@@ -82,6 +82,11 @@ const PassportModal: FC<PassportModalProps> = props => {
 	const { locale, formatMessage } = useIntl();
 	const { isAnimating, closeModal } = useModalAnimation(setShowModal);
 
+	const MBDEligibile =
+		qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
+		passportState !== EPassportState.SIGNED &&
+		passportState !== EPassportState.LOADING_SCORE;
+
 	const QFEligibilityCurrentState =
 		qfEligibilityState === EQFElegibilityState.ELIGIBLE
 			? EQFElegibilityTagState.ELIGIBLE
@@ -93,16 +98,20 @@ const PassportModal: FC<PassportModalProps> = props => {
 		passportState !== EPassportState.CONNECTING &&
 		passportState !== EPassportState.NOT_CONNECTED &&
 		passportState !== EPassportState.INVALID &&
+		passportState !== EPassportState.ERROR &&
 		![
 			EQFElegibilityState.CHECK_ELIGIBILITY,
 			EQFElegibilityState.PROCESSING,
 			EQFElegibilityState.ERROR,
 			EQFElegibilityState.LOADING,
 		].includes(qfEligibilityState) &&
-		!(
-			qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
-			passportState !== EPassportState.SIGNED
-		);
+		!MBDEligibile;
+
+	const gitcoinNotConnected =
+		passportState === EPassportState.NOT_CONNECTED ||
+		passportState === EPassportState.NOT_SIGNED ||
+		passportState === EPassportState.NOT_CREATED ||
+		passportState === EPassportState.CONNECTING;
 
 	const qfRoundEndDate = currentRound?.endDate
 		? new Date(currentRound.endDate)
@@ -136,7 +145,7 @@ const PassportModal: FC<PassportModalProps> = props => {
 
 	useEffect(() => {
 		if (
-			passportState === EPassportState.ERROR ||
+			qfEligibilityState === EQFElegibilityState.ERROR ||
 			qfEligibilityState === EQFElegibilityState.ELIGIBLE
 		) {
 			setTimeout(() => {
@@ -228,6 +237,14 @@ const PassportModal: FC<PassportModalProps> = props => {
 					/>
 				)}
 				<Hr />
+				{passportState === EPassportState.ERROR && (
+					<InlineToast
+						type={EToastType.Error}
+						message={formatMessage({
+							id: 'label.passport.error',
+						})}
+					/>
+				)}
 				<EligibilityCardBottom>
 					{passportState === EPassportState.INVALID ? (
 						<Button
@@ -240,31 +257,32 @@ const PassportModal: FC<PassportModalProps> = props => {
 								window.open(links.PASSPORT, '_blank')
 							}
 						/>
-					) : passportState === EPassportState.NOT_SIGNED ||
-					  passportState === EPassportState.CONNECTING ? (
-						<Button
-							label={formatMessage({
-								id: 'profile.qf_donor_eligibility.label.connect_gitcoin_passport',
-							})}
-							size='small'
-							buttonType='primary'
-							onClick={handleSign}
-							loading={
-								passportState === EPassportState.CONNECTING
-							}
-						/>
-					) : (
-						<RefreshButton onClick={refreshScore}>
-							<FlexCenter gap='8px'>
-								<IconPassport16 />
-								<ButtonText color={brandColors.pinky[500]}>
-									{formatMessage({
-										id: 'label.refresh_score',
-									})}
-								</ButtonText>
-							</FlexCenter>
-						</RefreshButton>
-					)}
+					) : passportState !== EPassportState.ERROR ? (
+						gitcoinNotConnected ? (
+							<Button
+								label={formatMessage({
+									id: 'profile.qf_donor_eligibility.label.connect_gitcoin_passport',
+								})}
+								size='small'
+								buttonType='primary'
+								onClick={handleSign}
+								loading={
+									passportState === EPassportState.CONNECTING
+								}
+							/>
+						) : (
+							<RefreshButton onClick={refreshScore}>
+								<FlexCenter gap='8px'>
+									<IconPassport16 />
+									<ButtonText color={brandColors.pinky[500]}>
+										{formatMessage({
+											id: 'label.refresh_score',
+										})}
+									</ButtonText>
+								</FlexCenter>
+							</RefreshButton>
+						)
+					) : null}
 				</EligibilityCardBottom>
 			</StyledWrapper>
 		</Modal>
diff --git a/src/components/views/donate/QFToast.tsx b/src/components/views/donate/QFToast.tsx
index e3555e34eb..ccb80fb040 100644
--- a/src/components/views/donate/QFToast.tsx
+++ b/src/components/views/donate/QFToast.tsx
@@ -19,10 +19,6 @@ const QFToast = () => {
 	const { qfEligibilityState, currentRound } = info;
 
 	const isEligible = qfEligibilityState === EQFElegibilityState.ELIGIBLE;
-	const isNotEligible =
-		qfEligibilityState === EQFElegibilityState.CHECK_ELIGIBILITY ||
-		qfEligibilityState === EQFElegibilityState.MORE_INFO_NEEDED ||
-		qfEligibilityState === EQFElegibilityState.RECHECK_ELIGIBILITY;
 
 	const { formatMessage, locale } = useIntl();
 
@@ -64,9 +60,7 @@ const QFToast = () => {
 		description = (
 			<>
 				{formatMessage({
-					id: `page.donate.passport_toast.description.${
-						isNotEligible ? 'non_eligible' : 'not_connected'
-					}`,
+					id: 'page.donate.passport_toast.description.non_eligible',
 				})}{' '}
 				<span>{endDate}</span>
 			</>
diff --git a/src/components/views/qfEligibility/QFEligibility.view.tsx b/src/components/views/qfEligibility/QFEligibility.view.tsx
index 67607a13a4..73fa54e4f5 100644
--- a/src/components/views/qfEligibility/QFEligibility.view.tsx
+++ b/src/components/views/qfEligibility/QFEligibility.view.tsx
@@ -55,22 +55,25 @@ export const QFEligibilityView = () => {
 			? EQFElegibilityTagState.ELIGIBLE
 			: EQFElegibilityTagState.NOT_ELIGIBLE;
 
+	const MBDEligibile =
+		qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
+		passportState !== EPassportState.SIGNED &&
+		passportState !== EPassportState.LOADING_SCORE;
+
 	const showPassportScoreSection =
 		passportState !== EPassportState.NOT_SIGNED &&
 		passportState !== EPassportState.NOT_CREATED &&
 		passportState !== EPassportState.CONNECTING &&
 		passportState !== EPassportState.NOT_CONNECTED &&
 		passportState !== EPassportState.INVALID &&
+		passportState !== EPassportState.ERROR &&
 		![
 			EQFElegibilityState.CHECK_ELIGIBILITY,
 			EQFElegibilityState.PROCESSING,
 			EQFElegibilityState.ERROR,
 			EQFElegibilityState.LOADING,
 		].includes(qfEligibilityState) &&
-		!(
-			qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
-			passportState !== EPassportState.SIGNED
-		);
+		!MBDEligibile;
 
 	const showQFStateSection =
 		passportState === EPassportState.NOT_SIGNED ||
@@ -78,8 +81,7 @@ export const QFEligibilityView = () => {
 			EQFElegibilityState.CHECK_ELIGIBILITY,
 			EQFElegibilityState.PROCESSING,
 		].includes(qfEligibilityState) ||
-		(qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
-			passportState !== EPassportState.SIGNED);
+		MBDEligibile;
 
 	const checkEligibilityDisabled = [
 		EQFElegibilityState.LOADING,
@@ -88,6 +90,12 @@ export const QFEligibilityView = () => {
 		EQFElegibilityState.MORE_INFO_NEEDED,
 	].includes(qfEligibilityState);
 
+	const gitcoinNotConnected =
+		passportState === EPassportState.NOT_CONNECTED ||
+		passportState === EPassportState.NOT_SIGNED ||
+		passportState === EPassportState.NOT_CREATED ||
+		passportState === EPassportState.CONNECTING;
+
 	const qfRoundEndDate = currentRound?.endDate
 		? new Date(currentRound.endDate)
 				.toLocaleString(locale || 'en-US', {
@@ -130,8 +138,7 @@ export const QFEligibilityView = () => {
 					</>
 				);
 			case EQFElegibilityState.ELIGIBLE:
-				return passportState !== EPassportState.SIGNED &&
-					passportState !== EPassportState.LOADING_SCORE ? (
+				return MBDEligibile ? (
 					<>
 						{formatMessage({ id: 'label.you_are_all_set' })}
 						<IconVerifiedBadge size={24} />
@@ -140,7 +147,7 @@ export const QFEligibilityView = () => {
 					formatMessage({ id: 'label.passport_connected' })
 				);
 			case EQFElegibilityState.MORE_INFO_NEEDED:
-				return passportState === EPassportState.NOT_SIGNED
+				return gitcoinNotConnected
 					? formatMessage({
 							id: 'label.we_need_a_bit_more_info',
 						})
@@ -158,8 +165,7 @@ export const QFEligibilityView = () => {
 				EQFElegibilityState.LOADING,
 				EQFElegibilityState.NOT_CONNECTED,
 			].includes(qfEligibilityState) ||
-			(qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
-				passportState !== EPassportState.SIGNED)
+			MBDEligibile
 		) {
 			return (
 				<EligibilityCardBottom $justify='center'>
@@ -180,9 +186,7 @@ export const QFEligibilityView = () => {
 			);
 		} else if (
 			qfEligibilityState === EQFElegibilityState.MORE_INFO_NEEDED &&
-			(passportState === EPassportState.NOT_SIGNED ||
-				passportState === EPassportState.NOT_CREATED ||
-				passportState === EPassportState.CONNECTING)
+			gitcoinNotConnected
 		) {
 			return (
 				<EligibilityCardBottom $justify='center'>
@@ -241,8 +245,7 @@ export const QFEligibilityView = () => {
 							{QFEligibilityData[QFEligibilityCurrentState].icon}
 						</QFEligibilityStatus>
 					</EligibilityTop>
-					{(qfEligibilityState !== EQFElegibilityState.ELIGIBLE ||
-						passportState === EPassportState.SIGNED) && (
+					{!MBDEligibile && (
 						<EligibilityCardDesc>
 							{eligibilityDesc()}
 						</EligibilityCardDesc>
@@ -279,7 +282,7 @@ export const QFEligibilityView = () => {
 							</ScoreCard>
 						</PassportSection>
 					)}
-					{qfEligibilityState === EQFElegibilityState.ERROR && (
+					{passportState === EPassportState.ERROR && (
 						<InlineToast
 							type={EToastType.Error}
 							message={formatMessage({
diff --git a/src/components/views/userProfile/QFDonorEligibilityCard.tsx b/src/components/views/userProfile/QFDonorEligibilityCard.tsx
index f9cfb1bcd7..6ccdc546cf 100644
--- a/src/components/views/userProfile/QFDonorEligibilityCard.tsx
+++ b/src/components/views/userProfile/QFDonorEligibilityCard.tsx
@@ -44,6 +44,11 @@ export const QFDonorEligibilityCard = () => {
 	const { passportState, passportScore, qfEligibilityState, currentRound } =
 		info;
 
+	const MBDEligibile =
+		qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
+		passportState !== EPassportState.SIGNED &&
+		passportState !== EPassportState.LOADING_SCORE;
+
 	const QFEligibilityCurrentState =
 		qfEligibilityState === EQFElegibilityState.ELIGIBLE
 			? EQFElegibilityTagState.ELIGIBLE
@@ -55,16 +60,14 @@ export const QFDonorEligibilityCard = () => {
 		passportState !== EPassportState.CONNECTING &&
 		passportState !== EPassportState.NOT_CONNECTED &&
 		passportState !== EPassportState.INVALID &&
+		passportState !== EPassportState.ERROR &&
 		![
 			EQFElegibilityState.CHECK_ELIGIBILITY,
 			EQFElegibilityState.PROCESSING,
 			EQFElegibilityState.ERROR,
 			EQFElegibilityState.LOADING,
 		].includes(qfEligibilityState) &&
-		!(
-			qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
-			passportState !== EPassportState.SIGNED
-		);
+		!MBDEligibile;
 
 	const checkEligibilityDisabled = [
 		EQFElegibilityState.LOADING,
@@ -73,6 +76,12 @@ export const QFDonorEligibilityCard = () => {
 		EQFElegibilityState.MORE_INFO_NEEDED,
 	].includes(qfEligibilityState);
 
+	const gitcoinNotConnected =
+		passportState === EPassportState.NOT_CONNECTED ||
+		passportState === EPassportState.NOT_SIGNED ||
+		passportState === EPassportState.NOT_CREATED ||
+		passportState === EPassportState.CONNECTING;
+
 	const renderQFEligibilityState = () => {
 		switch (qfEligibilityState) {
 			case EQFElegibilityState.CHECK_ELIGIBILITY:
@@ -85,8 +94,7 @@ export const QFDonorEligibilityCard = () => {
 					</>
 				);
 			case EQFElegibilityState.ELIGIBLE:
-				return passportState !== EPassportState.SIGNED &&
-					passportState !== EPassportState.LOADING_SCORE ? (
+				return MBDEligibile ? (
 					<>
 						{formatMessage({ id: 'label.you_are_all_set' })}
 						<IconVerifiedBadge size={24} />
@@ -95,7 +103,7 @@ export const QFDonorEligibilityCard = () => {
 					formatMessage({ id: 'label.passport_connected' })
 				);
 			case EQFElegibilityState.MORE_INFO_NEEDED:
-				return passportState === EPassportState.NOT_SIGNED
+				return gitcoinNotConnected
 					? formatMessage({
 							id: 'label.we_need_a_bit_more_info',
 						})
@@ -192,9 +200,7 @@ export const QFDonorEligibilityCard = () => {
 						{[
 							EQFElegibilityState.CHECK_ELIGIBILITY,
 							EQFElegibilityState.PROCESSING,
-						].includes(qfEligibilityState) ||
-						(qfEligibilityState === EQFElegibilityState.ELIGIBLE &&
-							passportState !== EPassportState.SIGNED) ? (
+						].includes(qfEligibilityState) || MBDEligibile ? (
 							<Button
 								label={formatMessage({
 									id: 'profile.qf_donor_eligibility.label.check_eligibility',
@@ -210,7 +216,7 @@ export const QFDonorEligibilityCard = () => {
 							/>
 						) : qfEligibilityState ===
 								EQFElegibilityState.MORE_INFO_NEEDED &&
-						  passportState === EPassportState.NOT_SIGNED ? (
+						  gitcoinNotConnected ? (
 							<Button
 								label={formatMessage({
 									id: 'profile.qf_donor_eligibility.label.connect_gitcoin_passport',
@@ -218,6 +224,9 @@ export const QFDonorEligibilityCard = () => {
 								size='small'
 								buttonType='primary'
 								onClick={handleSign}
+								loading={
+									passportState === EPassportState.CONNECTING
+								}
 							/>
 						) : (
 							<RefreshButton onClick={refreshScore}>
@@ -233,7 +242,7 @@ export const QFDonorEligibilityCard = () => {
 						)}
 					</EligibilityCardBottom>
 				)}
-			{qfEligibilityState === EQFElegibilityState.ERROR && (
+			{passportState === EPassportState.ERROR && (
 				<InlineToast
 					type={EToastType.Error}
 					message={formatMessage({
diff --git a/src/hooks/usePassport.ts b/src/hooks/usePassport.ts
index 36b7e5317c..157e82d74b 100644
--- a/src/hooks/usePassport.ts
+++ b/src/hooks/usePassport.ts
@@ -268,7 +268,7 @@ export const usePassport = () => {
 			passportState: EPassportState.CONNECTING,
 			passportScore: null,
 			activeQFMBDScore: null,
-			currentRound: null,
+			currentRound: info.currentRound,
 		});
 
 		const passports = getPassports();
@@ -284,7 +284,7 @@ export const usePassport = () => {
 					passportState: EPassportState.NOT_SIGNED,
 					passportScore: null,
 					activeQFMBDScore: null,
-					currentRound: null,
+					currentRound: info.currentRound,
 				});
 			}
 		}
@@ -331,7 +331,7 @@ export const usePassport = () => {
 						passportState: EPassportState.NOT_SIGNED,
 						passportScore: null,
 						activeQFMBDScore: null,
-						currentRound: null,
+						currentRound: info.currentRound,
 					});
 				}
 			} else {
diff --git a/src/services/passport.ts b/src/services/passport.ts
index fb8b3eaecc..ab4ec9cbb4 100644
--- a/src/services/passport.ts
+++ b/src/services/passport.ts
@@ -18,6 +18,7 @@ export const fetchPassportScore = async (account: string) => {
 			variables: {
 				address: account?.toLowerCase(),
 			},
+			fetchPolicy: 'network-only',
 		});
 		return data;
 	} catch (error) {