diff --git a/Changelog b/Changelog
index 678dc358e..6233ac374 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-10-30 DariusIII
+	* Chg: Add fallback routes to web and api
 	* Chg: Update messages output in ProcessReleases
 	* Chg: Update ColorCLI output, remove added newline string (\n)
 	* Chg: Update phpunit/php-token-stream to version 3.0.1
diff --git a/resources/views/notFound.blade.php b/resources/views/notFound.blade.php
new file mode 100644
index 000000000..724fd0a6a
--- /dev/null
+++ b/resources/views/notFound.blade.php
@@ -0,0 +1,7 @@
+@extends ('errors.layout')
+
+@section ('content')
+    <h3>Sorry {{ auth()->user()->username }} ! This page doesn't exist.</h3>
+    <br>
+    <h4>Browse back and try again.</h4>
+@stop
diff --git a/routes/api.php b/routes/api.php
index b45460a9b..dbf190bf7 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -34,3 +34,7 @@ Route::group(['prefix' => 'v2', 'namespace' => 'Api', 'middleware' => ['auth:api
     Route::get('details', 'ApiV2Controller@details');
     Route::post('details', 'ApiV2Controller@details');
 });
+
+Route::fallback(function(){
+    return response()->json(['message' => 'Not Found!'], 404);
+});
diff --git a/routes/web.php b/routes/web.php
index 51fb81286..2d14fa992 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -347,3 +347,7 @@ Route::group(['middleware' => ['role_or_permission:Admin|Moderator|edit release'
     Route::get('release-edit', 'ReleasesController@edit');
     Route::post('release-edit', 'ReleasesController@edit');
 });
+
+Route::fallback(function(){
+    return response()->view('notFound', [], 404);
+});