diff --git a/__tests__/components/__snapshots__/error.test.jsx.snap b/__tests__/components/__snapshots__/error.test.jsx.snap
index e804bff57..ff4eb1b04 100644
--- a/__tests__/components/__snapshots__/error.test.jsx.snap
+++ b/__tests__/components/__snapshots__/error.test.jsx.snap
@@ -13,7 +13,7 @@ exports[`ErrorComponet displays error cause and error message properly 1`] = `
       />
       <a
         className="flex items-center"
-        href="/classes"
+        href="/"
         onClick={[Function]}
         onMouseEnter={[Function]}
         onTouchStart={[Function]}
diff --git a/__tests__/components/__snapshots__/navbar.test.jsx.snap b/__tests__/components/__snapshots__/navbar.test.jsx.snap
index c583d7f59..bd824bc3c 100644
--- a/__tests__/components/__snapshots__/navbar.test.jsx.snap
+++ b/__tests__/components/__snapshots__/navbar.test.jsx.snap
@@ -12,7 +12,7 @@ exports[`Navbar rendering correctly renders correctly 1`] = `
     />
     <a
       className="flex items-center"
-      href="/classes"
+      href="/"
       onClick={[Function]}
       onMouseEnter={[Function]}
       onTouchStart={[Function]}
diff --git a/__tests__/components/navbar.test.jsx b/__tests__/components/navbar.test.jsx
index 33f684deb..32063bbdb 100644
--- a/__tests__/components/navbar.test.jsx
+++ b/__tests__/components/navbar.test.jsx
@@ -1,6 +1,8 @@
 import Navbar from '../../components/navbar';
 import React from 'react';
 import { SessionProvider } from 'next-auth/react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
 import renderer from 'react-test-renderer';
 
 describe('Navbar rendering correctly', () => {
@@ -15,3 +17,43 @@ describe('Navbar rendering correctly', () => {
     expect(tree).toMatchSnapshot();
   });
 });
+
+describe('Navbar Home button', () => {
+  const findHomeLink = () => screen.getByRole('link', { name: /freecodecamp logo/i });
+
+  it('points to the application home page when logged in as a teacher', () => {
+    render(
+      <SessionProvider session={{ user: { name: 'teacher', role: 'TEACHER' } }}>
+        <Navbar />
+      </SessionProvider>
+    );
+    expect(findHomeLink()).toHaveAttribute('href', '/');
+  });
+
+  it('points to the application home page when logged in as an admin', () => {
+    render(
+      <SessionProvider session={{ user: { name: 'admin', role: 'ADMIN' } }}>
+        <Navbar />
+      </SessionProvider>
+    );
+    expect(findHomeLink()).toHaveAttribute('href', '/');
+  });
+
+  it('points to the application home page when logged in as another role', () => {
+    render(
+      <SessionProvider session={{ user: { name: 'student', role: 'STUDENT' } }}>
+        <Navbar />
+      </SessionProvider>
+    );
+    expect(findHomeLink()).toHaveAttribute('href', '/');
+  });
+
+  it('points to the application home page when not logged in', () => {
+    render(
+      <SessionProvider session={null}>
+        <Navbar />
+      </SessionProvider>
+    );
+    expect(findHomeLink()).toHaveAttribute('href', '/');
+  });
+});
diff --git a/components/navbar.js b/components/navbar.js
index fc24c5080..1f4c3664b 100644
--- a/components/navbar.js
+++ b/components/navbar.js
@@ -8,7 +8,7 @@ export default function Navbar({ children, hideAuthButton = false }) {
     <div className='h-[38px]'>
       <div className='h-[38px] bg-fcc-gray-90 text-white flex items-center flex-wrap p-1'>
         <div className='hidden lg:flex block flex-1 justify-end'></div>
-        <Link href='/classes' className='flex items-center'>
+        <Link href='/' className='flex items-center'>
           <Image
             className=''
             priority