diff --git a/lib/www/client/source/src/views/Project.vue b/lib/www/client/source/src/views/Project.vue
index 5f4cc92..3f31f85 100644
--- a/lib/www/client/source/src/views/Project.vue
+++ b/lib/www/client/source/src/views/Project.vue
@@ -1,18 +1,25 @@
 <template>
   <v-container fluid fill-height class="ma-0 pa-0">
     <v-row no-gutters align="stretch" class="fill-height">
-      <v-col cols="12">
+      <v-col cols="12" v-if="projectFound">
         <!-- Show component here according to selected route -->
         <keep-alive>
           <router-view :key="$route.path"></router-view>
         </keep-alive>
       </v-col>
+      <v-col cols="12" v-else>
+        <v-card>
+          <v-card-text>
+            Project does not exist.
+          </v-card-text>
+        </v-card>
+      </v-col>
     </v-row>
   </v-container>
 </template>
 
 <script>
-import { mapActions } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 
 export default {
   name: 'Project',
@@ -24,6 +31,15 @@ export default {
     }
   },
 
+  computed: {
+
+    projectFound () {
+      return this.loading || this.projectId;
+    },
+
+    ...mapGetters(["loading", "projectId", "serverEvent"])
+  },
+
   methods: {
     ...mapActions(["getProject"])
   },