diff --git a/src/core/tools/attemptCompletionTool.ts b/src/core/tools/attemptCompletionTool.ts
index 3709bb1a87..481b4e1b5a 100644
--- a/src/core/tools/attemptCompletionTool.ts
+++ b/src/core/tools/attemptCompletionTool.ts
@@ -108,7 +108,7 @@ export async function attemptCompletionTool(
 			}
 
 			// Send offer_pr message if not in PR Creator mode
-			if (cline.mode !== "pr-creator") {
+			if (cline.taskMode !== "pr-creator") {
 				await cline.say("offer_pr", "", undefined, false)
 			} else {
 				// In PR Creator mode, send PR Reviewer upsell after completion
diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx
index b7521f8368..24bb3ced4a 100644
--- a/webview-ui/src/components/chat/ChatRow.tsx
+++ b/webview-ui/src/components/chat/ChatRow.tsx
@@ -131,7 +131,8 @@ export const ChatRowContent = ({
 }: ChatRowContentProps) => {
 	const { t } = useTranslation()
 
-	const { mcpServers, alwaysAllowMcp, currentCheckpoint, mode, apiConfiguration, cloudApiUrl } = useExtensionState()
+	const { mcpServers, alwaysAllowMcp, currentCheckpoint, mode, apiConfiguration, cloudApiUrl, cloudIsAuthenticated } =
+		useExtensionState()
 	const { info: model } = useSelectedModel(apiConfiguration)
 
 	// Function to switch modes
@@ -1278,6 +1279,10 @@ export const ChatRowContent = ({
 						</>
 					)
 				case "pr_reviewer_upsell":
+					// Only show if user is authenticated to Cloud
+					if (!cloudIsAuthenticated) {
+						return null
+					}
 					return (
 						<div className="ml-6 text-sm mt-2">
 							{t("chat:prReviewerUpsell.message")}{" "}