diff --git a/src/components/404.vue b/src/components/404.vue
new file mode 100644
index 000000000..a2151d6a8
--- /dev/null
+++ b/src/components/404.vue
@@ -0,0 +1,12 @@
+<template>
+	<div class="content has-text-centered">
+		<h1>Not found</h1>
+		<p>The page you requested does not exist.</p>
+	</div>
+</template>
+
+<script>
+	export default {
+		name: '404'
+	}
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index cc1374e49..5cb4bceec 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 import HomeComponent from '@/components/Home'
+import NotFoundComponent from '@/components/404'
 // User Handling
 import LoginComponent from '@/components/user/Login'
 import RegisterComponent from '@/components/user/Register'
@@ -53,6 +54,11 @@ export default new Router({
 			name: 'home',
 			component: HomeComponent
 		},
+		{
+			path: '*',
+			name: '404',
+			component: NotFoundComponent,
+		},
 		{
 			path: '/login',
 			name: 'login',