diff --git a/services/frontend/src/components/material/NavigationBar/NavigationButton.tsx b/services/frontend/src/components/material/NavigationBar/NavigationButton.tsx
index 1631e88e8..7aaa67ef2 100644
--- a/services/frontend/src/components/material/NavigationBar/NavigationButton.tsx
+++ b/services/frontend/src/components/material/NavigationBar/NavigationButton.tsx
@@ -14,7 +14,7 @@ export const NavigationButton = ({ item }: { item: NavigationItem }) => {
   const location = useLocation()
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null)
 
-  const { key, label, path, items } = item
+  const { key, label, items } = item
 
   const showItem = (subItemKey: string) => {
     if (['class', 'completedCoursesSearch', 'overview'].includes(subItemKey)) {
@@ -93,14 +93,7 @@ export const NavigationButton = ({ item }: { item: NavigationItem }) => {
   }
 
   return (
-    <Typography
-      color="inherit"
-      component={Link}
-      data-cy={`nav-bar-button-${key}`}
-      sx={{ '&:hover': { color: 'inherit' } }}
-      to={path}
-      variant="button"
-    >
+    <Typography color="inherit" data-cy={`nav-bar-button-${key}`} variant="button">
       {label}
     </Typography>
   )
diff --git a/services/frontend/src/components/material/NavigationBar/index.tsx b/services/frontend/src/components/material/NavigationBar/index.tsx
index 9f16cdfab..8454245a7 100644
--- a/services/frontend/src/components/material/NavigationBar/index.tsx
+++ b/services/frontend/src/components/material/NavigationBar/index.tsx
@@ -1,6 +1,6 @@
 import { AppBar, Box, Container, Tab, Tabs, Toolbar } from '@mui/material'
 import { useState, useEffect } from 'react'
-import { useLocation } from 'react-router-dom'
+import { Link, useLocation } from 'react-router-dom'
 
 import { checkUserAccess, getFullStudyProgrammeRights, isDefaultServiceProvider } from '@/common'
 import { hasFullAccessToTeacherData } from '@/components/Teachers/util'
@@ -92,7 +92,13 @@ export const NavigationBar = () => {
             {!isLoading && (
               <Tabs textColor="inherit" value={activeTab} variant="scrollable">
                 {Object.entries(visibleNavigationItems).map(([key, item]) => (
-                  <Tab key={key} label={<NavigationButton item={item} />} />
+                  <Tab
+                    component={Link}
+                    key={key}
+                    label={<NavigationButton item={item} />}
+                    sx={{ '&:hover': { color: 'inherit' } }}
+                    to={item.path}
+                  />
                 ))}
               </Tabs>
             )}