diff --git a/web/app/src/AuthCheck.svelte b/web/app/src/AuthCheck.svelte
index f7c8e6f..47ca3b8 100644
--- a/web/app/src/AuthCheck.svelte
+++ b/web/app/src/AuthCheck.svelte
@@ -1,9 +1,10 @@
 <script>
     import { token } from "./stores.js";
+    import { isTokenExpired } from "./login-check.js";
 
     let loggedIn = false;
     token.subscribe((value) => {
-        loggedIn = value !== "";
+        loggedIn = !isTokenExpired(value);
     });
 </script>
 
diff --git a/web/app/src/AuthRequired.svelte b/web/app/src/AuthRequired.svelte
index 3fcf8fe..52886a4 100644
--- a/web/app/src/AuthRequired.svelte
+++ b/web/app/src/AuthRequired.svelte
@@ -2,10 +2,11 @@
     import { token } from "./stores.js";
     import { navigate } from "svelte-routing";
     import { onMount } from "svelte";
+    import { isTokenExpired } from "./login-check.js";
 
     let loggedIn = false;
     token.subscribe((value) => {
-        loggedIn = value !== "";
+        loggedIn = !isTokenExpired(value);
     });
 
     onMount(() => {
diff --git a/web/app/src/Navbar.svelte b/web/app/src/Navbar.svelte
index 36e3b6f..854e9fb 100644
--- a/web/app/src/Navbar.svelte
+++ b/web/app/src/Navbar.svelte
@@ -1,12 +1,13 @@
 <script>
     import { Link } from "svelte-routing";
     import { token } from "./stores.js";
+    import { isTokenExpired } from "./login-check.js";
 
     let menu_shown = false;
 
     let loggedIn = false;
     token.subscribe((value) => {
-        loggedIn = value !== "";
+        loggedIn = !isTokenExpired(value);
     });
 
     const toggleMenu = () => {
diff --git a/web/app/src/login-check.js b/web/app/src/login-check.js
new file mode 100644
index 0000000..11a3d64
--- /dev/null
+++ b/web/app/src/login-check.js
@@ -0,0 +1,8 @@
+const isTokenExpired = (token) => {
+    if (token === "") return true;
+    
+    const expiry = (JSON.parse(atob(token.split('.')[1]))).exp;
+    return (Math.floor((new Date).getTime() / 1000)) >= expiry;
+}
+
+export { isTokenExpired }
\ No newline at end of file