diff --git a/src/components/profile/ProfileCard.tsx b/src/components/profile/ProfileCard.tsx
index c2d9fbd..5eb8480 100644
--- a/src/components/profile/ProfileCard.tsx
+++ b/src/components/profile/ProfileCard.tsx
@@ -158,33 +158,36 @@ export function ProfileCard({
 
         {/* Action Buttons */}
         <div className="flex items-center justify-center lg:justify-start gap-3">
-          {messageHref ? (
-            <Link
-              href={messageHref}
-              onClick={(e) => handleActionClick(e, messageHref)}
-              className="flex items-center gap-2 px-4 py-1.5 bg-[#e58625] text-[#00293d] text-sm font-normal rounded-[15px] border border-[#00293d]/10 hover:bg-[#d47720] transition-colors font-serif cursor-pointer"
-            >
-              <Image
-                src="/assets/icons/message-dark-icon.svg"
-                alt="Message"
-                width={14}
-                height={13}
-              />
-              Message
-            </Link>
-          ) : (
-            <button
-              onClick={(e) => handleActionClick(e)}
-              className="flex items-center gap-2 px-4 py-1.5 bg-[#e58625] text-[#00293d] text-sm font-normal rounded-[15px] border border-[#00293d]/10 hover:bg-[#d47720] transition-colors font-serif cursor-pointer"
-            >
-              <Image
-                src="/assets/icons/message-dark-icon.svg"
-                alt="Message"
-                width={14}
-                height={13}
-              />
-              Message
-            </button>
+          {/* Message button - only enabled when connected */}
+          {(showEditButton || connectionStatus === 'ACCEPTED') && (
+            messageHref ? (
+              <Link
+                href={messageHref}
+                onClick={(e) => handleActionClick(e, messageHref)}
+                className="flex items-center gap-2 px-4 py-1.5 bg-[#e58625] text-[#00293d] text-sm font-normal rounded-[15px] border border-[#00293d]/10 hover:bg-[#d47720] transition-colors font-serif cursor-pointer"
+              >
+                <Image
+                  src="/assets/icons/message-dark-icon.svg"
+                  alt="Message"
+                  width={14}
+                  height={13}
+                />
+                Message
+              </Link>
+            ) : (
+              <button
+                onClick={(e) => handleActionClick(e)}
+                className="flex items-center gap-2 px-4 py-1.5 bg-[#e58625] text-[#00293d] text-sm font-normal rounded-[15px] border border-[#00293d]/10 hover:bg-[#d47720] transition-colors font-serif cursor-pointer"
+              >
+                <Image
+                  src="/assets/icons/message-dark-icon.svg"
+                  alt="Message"
+                  width={14}
+                  height={13}
+                />
+                Message
+              </button>
+            )
           )}
           {showEditButton && requestsHref ? (
             // Agent's own profile - show Requests link with badge