diff --git a/src/components/Map.vue b/src/components/Map.vue
index f236ef4..bb13753 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -1,8 +1,8 @@
 <template>
     <v-layout row fill-height wrap>
-        <v-flex xs12 class="speed-badge text-xs-center white" v-if="speed !== null && speed !== undefined">
+        <v-flex xs12 class="speed-badge text-xs-center white" v-if="speedInKmH !== null">
             <v-layout column>
-                <v-flex xs8 class="title mt-1">{{ speed }}</v-flex>
+                <v-flex xs8 class="title mt-1">{{ speedInKmH }}</v-flex>
                 <v-flex xs4 class="caption">km/h</v-flex>
             </v-layout>
         </v-flex>
@@ -112,6 +112,13 @@ export default {
             // Get the currently shown report details ID
             return this.$store.state.reportDetails.id;
         },
+        speedInKmH() {
+            // Convert speed from m/s to km/h
+            if (this.speed !== null && this.speed !== undefined) {
+                return this.speed * 3600 / 1000;
+            }
+            return null;
+        },
         tileServer() {
             const tileServerSetting = this.$store.state.settings.tileServer;
             if (tileServerSetting in constants.TILE_SERVERS) {
@@ -444,7 +451,7 @@ export default {
         polyline: Array,
         positionLatLng: Array,
         reportLatLng: Array,
-        speed: Number,
+        speed: Number, // in m/s
         zoom: {
             type: Number,
             required: true,
diff --git a/src/tools/index.js b/src/tools/index.js
index 82652d6..4b3bfe8 100644
--- a/src/tools/index.js
+++ b/src/tools/index.js
@@ -38,7 +38,7 @@ export function mockLocationRandom() {
     }
     let speed = null;
     if (Math.random() > 0.25) {
-        speed = Math.random() * 20;
+        speed = Math.random() * 9; // in meters/s
     }
     const newLocation = {
         coords: {