diff --git a/src/app/messages/page.tsx b/src/app/messages/page.tsx
index 291665d..5c5c201 100644
--- a/src/app/messages/page.tsx
+++ b/src/app/messages/page.tsx
@@ -117,7 +117,7 @@ export default function MessagesPage() {
         if (user) {
             fetchConversations();
         }
-    }, [user, fetchConversations]);
+    }, [user, fetchConversations, refreshUnreadCount]);
 
     // Real-time polling
     useEffect(() => {
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index dc59e98..ee9408f 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -43,6 +43,7 @@ export default function Navbar() {
 
           <ul className="nav-links desktop-links">
             <li className={pathname === "/" ? "current-menu-item" : ""}>
+              {/* eslint-disable-next-line @next/next/no-html-link-for-pages */}
               <a href="/">HEM</a>
             </li>
             <li className={pathname === "/products" ? "current-menu-item" : ""}>
@@ -62,6 +63,7 @@ export default function Navbar() {
 
         {/* Center: Logo Only */}
         <div className="nav-center">
+          {/* eslint-disable-next-line @next/next/no-html-link-for-pages */}
           <a href="/" className="logo-link">
             <Image
               src={logo}
diff --git a/src/context/NotificationContext.tsx b/src/context/NotificationContext.tsx
index ba4ff14..d83c61a 100644
--- a/src/context/NotificationContext.tsx
+++ b/src/context/NotificationContext.tsx
@@ -11,7 +11,7 @@ interface NotificationContextType {
 const NotificationContext = createContext<NotificationContextType | undefined>(undefined);
 
 export function NotificationProvider({ children }: { children: React.ReactNode }) {
-    const { user, isAuthenticated } = useAuth();
+    const { isAuthenticated } = useAuth();
     const [unreadCount, setUnreadCount] = useState(0);
     const [isMounted, setIsMounted] = useState(false);