diff --git a/lib/site.js b/lib/site.js
index 9cfa16d..d89a3f4 100644
--- a/lib/site.js
+++ b/lib/site.js
@@ -103,6 +103,8 @@ class Site
     {
         this.express.use('/', express.static(path.join(__dirname, '../site/dist')))
 
+        console.log('/' + _project.slug + '/download')
+
         // Project download route
         this.express.get('/' + _project.slug + '/download', (request, response) =>
         {
@@ -122,11 +124,6 @@ class Site
         })
 
         this.express.use('/' + _project.slug + '/files', express.static(_project.path))
-
-        this.express.get('/*', (request, response) =>
-        {
-            response.sendFile(path.join(__dirname, '../site/dist/index.html'))
-        })
     }
 }
 
diff --git a/site/src/components/connexion/script.js b/site/src/components/connexion/script.js
index f296d92..def8942 100644
--- a/site/src/components/connexion/script.js
+++ b/site/src/components/connexion/script.js
@@ -65,9 +65,12 @@ export default
                 return
             }
 
-            // Set null file
+            // Reset file
             this.$store.commit('setFile', null)
 
+            // Reset messages
+            this.$store.commit('emptyMessages', null)
+
             // If was connected to another socket
             if(this.projectSocket)
             {
diff --git a/site/src/store/modules/chat.js b/site/src/store/modules/chat.js
index ec40f9a..8df7464 100644
--- a/site/src/store/modules/chat.js
+++ b/site/src/store/modules/chat.js
@@ -13,6 +13,11 @@ export default {
 
     mutations:
     {
+        emptyMessages(state)
+        {
+            state.messages = []
+        },
+
         createMessage(state, data)
         {
             state.messages.push(data)
diff --git a/site/src/store/modules/projects.js b/site/src/store/modules/projects.js
index 486afa5..9f4d920 100644
--- a/site/src/store/modules/projects.js
+++ b/site/src/store/modules/projects.js
@@ -17,7 +17,8 @@ export default {
                 // Current project has been removed
                 if(typeof state.all[state.current.slug] === 'undefined')
                 {
-                    state.current = null
+                    const projectKeys = Object.keys(state.all)
+                    state.current = state.all[projectKeys[0]]
                 }
             }