diff --git a/js/id/id.js b/js/id/id.js
index 358610525..56d3e481a 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -16,6 +16,10 @@ window.iD = function () {
     // the connection requires .storage() to be available on calling.
     var connection = iD.Connection(context);
 
+    connection.on('load.context', function (err, result) {
+        history.merge(result);
+    });
+
     /* Straight accessors. Avoid using these if you can. */
     context.ui = function() { return ui; };
     context.connection = function() { return connection; };
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index c3b528da3..b2561f21f 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -26,9 +26,6 @@ iD.Map = function(context) {
         surface, tilegroup;
 
     function map(selection) {
-        context.connection()
-            .on('load.tile', connectionLoad);
-
         context.history()
             .on('change.map', redraw);
 
@@ -100,10 +97,6 @@ iD.Map = function(context) {
         surface.selectAll('.layer *').remove();
     }
 
-    function connectionLoad(err, result) {
-        context.history().merge(result);
-    }
-
     function zoomPan() {
         if (d3.event && d3.event.sourceEvent.type === 'dblclick') {
             if (!dblclickEnabled) {