diff --git a/src/app/services/sync.service.ts b/src/app/services/sync.service.ts
index d0f2819..f02c8ce 100644
--- a/src/app/services/sync.service.ts
+++ b/src/app/services/sync.service.ts
@@ -9,8 +9,10 @@ import * as _ from 'lodash';
 })
 export class SyncService {
     private code: string;
+    private changed = false;
     private collection: AngularFirestoreCollection;
     private mapSub: Subscription;
+    private saveRate = 5_000;
 
     mapSymbols = new BehaviorSubject<MapData>(null);
 
@@ -26,42 +28,48 @@ export class SyncService {
         let map = this.mapSymbols.value;
         if(!map.circles) map.circles = [];
         map.circles.push(circle);
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     addMarker(marker: Marker) {
         let map = this.mapSymbols.value;
         if(!map.markers) map.markers = [];
         map.markers.push(marker);
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     addMeasurement(measurement: Measurement) {
         let map = this.mapSymbols.value;
         if(!map.measurements) map.measurements = [];
         map.measurements.push(measurement);
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     addPolygon(polygon: Polygon) {
         let map = this.mapSymbols.value;
         if(!map.polygons) map.polygons = [];
         map.polygons.push(polygon);
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     addPolyline(polyline: Polyline) {
         let map = this.mapSymbols.value;
         if(!map.polylines) map.polylines = [];
         map.polylines.push(polyline);
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     addRectangle(rect: Rectangle) {
         let map = this.mapSymbols.value;
         if(!map.rectangles) map.rectangles = [];
         map.rectangles.push(rect);
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     delete(...symbols) {
@@ -72,7 +80,8 @@ export class SyncService {
         if(map.polygons) symbols.forEach(s => map.polygons = map.polygons.filter(p => !_.isEqual(s , p)));
         if(map.polylines) symbols.forEach(s => map.polylines = map.polylines.filter(p => !_.isEqual(s, p)));
         if(map.rectangles) symbols.forEach(s => map.rectangles = map.rectangles.filter(r => !_.isEqual(s, r)));
-        this.save();
+        this.mapSymbols.next(map);
+        this.changed = true;
     }
 
     load(mapCode: string) {
@@ -81,12 +90,18 @@ export class SyncService {
             this.mapSub = null;
         }
         this.code = mapCode;
-        this.mapSub = this.collection.doc(this.code).valueChanges().subscribe(newMap => this.mapSymbols.next(Object.assign({}, newMap)));
+        this.mapSub = this.collection.doc(this.code).valueChanges().subscribe(newMap => {
+            this.mapSymbols.next(Object.assign({}, newMap));
+            this.changed = false;
+        });
+
+        setInterval(() => this.save(), this.saveRate);
     }
 
     save() {
-        if(this.code && this.mapSymbols.value) {
+        if(this.code && this.mapSymbols.value && this.changed) {
             this.collection.doc(this.code).set(this.mapSymbols.value);
+            this.changed = false;
         }
     }
 }
diff --git a/src/app/views/map/map.component.ts b/src/app/views/map/map.component.ts
index 6f1a98d..fc584d4 100644
--- a/src/app/views/map/map.component.ts
+++ b/src/app/views/map/map.component.ts
@@ -188,23 +188,23 @@ export class MapComponent implements OnInit {
         this.route.params.subscribe(params => {
             this.code = params['code'];
             this.syncService.load(this.code);
-
-            // Handle drawing the map after updates
-            this.syncService.mapSymbols.pipe(filter(s => !!s)).subscribe((map: MapData) => {
-                this.map.deleteAll();
-                if (map.circles) map.circles.forEach(c => this.map.newCircle(c));
-                if (map.markers) map.markers.forEach(m => this.map.newMarker(m));
-                if (map.measurements) map.measurements.forEach(m => this.map.newMeasurement(m));
-                if (map.polygons) map.polygons.forEach(p => this.map.newPolygon(p));
-                if (map.polylines) map.polylines.forEach(p => this.map.newPolyline(p));
-                if (map.rectangles) map.rectangles.forEach(r => this.map.newRectangle(r));
-            })
         })
     }
 
     ngOnInit() {
         this.map = new MapService('map');
 
+        // Handle drawing the map after updates
+        this.syncService.mapSymbols.pipe(filter(s => !!s)).subscribe((map: MapData) => {
+            this.map.deleteAll();
+            if (map.circles) map.circles.forEach(c => this.map.newCircle(c));
+            if (map.markers) map.markers.forEach(m => this.map.newMarker(m));
+            if (map.measurements) map.measurements.forEach(m => this.map.newMeasurement(m));
+            if (map.polygons) map.polygons.forEach(p => this.map.newPolygon(p));
+            if (map.polylines) map.polylines.forEach(p => this.map.newPolyline(p));
+            if (map.rectangles) map.rectangles.forEach(r => this.map.newRectangle(r));
+        });
+
         // Handle opening symbols
         this.map.click.pipe(filter(e => !!e && e.item)).subscribe(e => {
             if (e.item instanceof L.Marker) {