diff --git a/package.json b/package.json
index 2effe07..b1b7281 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mapswipe-web",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/src/components/CompareProject.vue b/src/components/CompareProject.vue
index 496492c..6aa64a2 100644
--- a/src/components/CompareProject.vue
+++ b/src/components/CompareProject.vue
@@ -126,6 +126,7 @@ export default defineComponent({
   created() {
     this.startTime = new Date().toISOString()
     this.taskId = this.tasks[this.taskIndex].taskId
+    this.$emit('created')
     this.logMappingStarted(this.project.projectType)
   },
 })
diff --git a/src/components/DigitizeProject.vue b/src/components/DigitizeProject.vue
index b73089b..f1b790e 100644
--- a/src/components/DigitizeProject.vue
+++ b/src/components/DigitizeProject.vue
@@ -191,6 +191,7 @@ export default defineComponent({
     this.taskId = this.tasks[this.taskIndex].taskId
     this.updateTaskFeature()
     if (this.tasks.length === 1) this.endReached = true
+    this.$emit('created')
     this.logMappingStarted(this.project.projectType)
   },
 })
diff --git a/src/components/FindProject.vue b/src/components/FindProject.vue
index 48aff9a..3ee1eb4 100644
--- a/src/components/FindProject.vue
+++ b/src/components/FindProject.vue
@@ -275,6 +275,7 @@ export default defineComponent({
     this.onResize()
   },
   created() {
+    this.$emit('created')
     this.logMappingStarted(this.project.projectType)
   },
 })
diff --git a/src/components/MediaProject.vue b/src/components/MediaProject.vue
index 61e6ce5..2e25fee 100644
--- a/src/components/MediaProject.vue
+++ b/src/components/MediaProject.vue
@@ -109,6 +109,7 @@ export default defineComponent({
   created() {
     this.startTime = new Date().toISOString()
     this.taskId = this.tasks[this.taskIndex].taskId
+    this.$emit('created')
     this.logMappingStarted(this.project.projectType)
   },
 })
diff --git a/src/components/ValidateProject.vue b/src/components/ValidateProject.vue
index 257fd6c..f5e5640 100644
--- a/src/components/ValidateProject.vue
+++ b/src/components/ValidateProject.vue
@@ -163,6 +163,7 @@ export default defineComponent({
     this.startTime = new Date().toISOString()
     this.taskId = this.tasks[this.taskIndex].taskId
     this.updateTaskFeature()
+    this.$emit('created')
     this.logMappingStarted(this.project.projectType)
   },
 })
diff --git a/src/firebase/index.ts b/src/firebase/index.ts
index 4cba4eb..34a0af5 100644
--- a/src/firebase/index.ts
+++ b/src/firebase/index.ts
@@ -23,7 +23,7 @@ export const logAnalyticsEvent = (eventName, eventParams = {}) => {
 }
 
 // used for the database refs
-const db = getDatabase(firebaseApp)
+export const db = getDatabase(firebaseApp)
 
 // export reusable database references
 export const dbRef = ref(db)
diff --git a/src/views/ProjectView.vue b/src/views/ProjectView.vue
index 71a7ce0..81ca8ca 100644
--- a/src/views/ProjectView.vue
+++ b/src/views/ProjectView.vue
@@ -1,7 +1,8 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { onValue, set } from 'firebase/database'
+import { goOffline, goOnline, off, onValue, set } from 'firebase/database'
 import {
+  db,
   getGroupsQuery,
   getProjectRef,
   getProjectContributionsRef,
@@ -37,6 +38,7 @@ export default defineComponent({
       completedGroupId: null,
       group: null,
       mode: 'contribute',
+      mappingSpeed: 1,
       nextDialog: false,
       project: null,
       projectContributions: [],
@@ -50,14 +52,19 @@ export default defineComponent({
         logAnalyticsEvent('mapping_started', { projectType: projectType })
       },
       saveResults: (results, startTime) => {
+        const numberOfTasks = Object.keys(results).length
+        const endTime = new Date().toISOString()
+        this.mappingSpeed = (Date.parse(endTime) - Date.parse(startTime)) / numberOfTasks
+
         const entry = {
-          endTime: new Date().toISOString(),
+          endTime,
           results,
           startTime,
         }
 
         this.completedGroupId = this.group.groupId
 
+        goOnline(db)
         set(getResultsRef(this.project.projectId, this.group.groupId, this.user.uid), entry)
           .then(() => {
             this.showSnackbar(
@@ -126,6 +133,7 @@ export default defineComponent({
           (g) => g.requiredCount > 0 && !completed.includes(g.groupId),
         )
         if (!available.length) {
+          this.nextDialog = false
           this.to = this.i18nRoute({ name: 'projects' })
           this.showDialog(
             this.$t('projectView.noTasksAvailable'),
@@ -134,6 +142,8 @@ export default defineComponent({
             true,
             false,
           )
+        } else {
+          this.hideDialog()
         }
         const random = available[Math.floor(Math.random() * available.length)]
         this.group = random
@@ -182,10 +192,20 @@ export default defineComponent({
       if (!this.completedGroupId) {
         return true
       } else {
-        const updated = this.projectContributions[this.completedGroupId]
-        return updated
+        const updated =
+          this.projectContributions[this.completedGroupId] &&
+          this.completedGroupId !== this.group?.groupId
+        /*
+          Firebase rejects results that are produced at a speed of less than 125 ms per task. Therefore, we do not wait for
+          updated projectContributions for speedy results.
+        */
+        const tooSpeedy = this.mappingSpeed < 125
+        return updated || tooSpeedy
       }
     },
+    handleTaskComponentCreated() {
+      goOffline(db)
+    },
   },
   beforeRouteLeave(to, from, next) {
     if (this.mode === 'contribute' && to.name !== 'authentication') {
@@ -197,6 +217,10 @@ export default defineComponent({
         true,
       )
     } else {
+      off(getProjectRef(this.projectId))
+      off(getGroupsQuery(this.projectId))
+      off(getProjectContributionsRef(this.user.uid, this.projectId))
+      goOnline(db)
       next()
     }
   },
@@ -219,6 +243,7 @@ export default defineComponent({
       :options="options"
       :project="project"
       :tasks="tasks"
+      @created="handleTaskComponentCreated"
     />
 
     <v-dialog v-model="nextDialog" max-width="600" persistent>