diff --git a/src/components/App.js b/src/components/App.js
index 70203c9..e575d6e 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -1,15 +1,19 @@
 import React from "react";
-import { Route } from "react-router-dom";
+import { Route, Switch } from "react-router-dom";
 import HomePage from "./home/HomePage";
 import AboutPage from "./about/AboutPage";
 import Header from "./common/Header";
+import PageNotFound from "./PageNotFound";
 
 function App() {
   return (
     <div className="container-fluid">
       <Header />
-      <Route exact path="/" component={HomePage} />
-      <Route path="/about" component={AboutPage} />
+      <Switch>
+        <Route exact path="/" component={HomePage} />
+        <Route path="/about" component={AboutPage} />
+        <Route component={PageNotFound} />
+      </Switch>
     </div>
   );
 }
diff --git a/src/components/PageNotFound.js b/src/components/PageNotFound.js
new file mode 100644
index 0000000..70a8d0f
--- /dev/null
+++ b/src/components/PageNotFound.js
@@ -0,0 +1,5 @@
+import React from "react";
+
+const PageNotFound = () => <h1>Oops! Page not found</h1>;
+
+export default PageNotFound;