diff --git a/js/id/renderer/background.js b/js/id/renderer/background.js
index ce478e220..6132a2f7e 100644
--- a/js/id/renderer/background.js
+++ b/js/id/renderer/background.js
@@ -257,7 +257,7 @@ iD.Background = function(context) {
         if (chosen && chosen.indexOf('custom:') === 0) {
             background.baseLayerSource(iD.BackgroundSource.Custom(chosen.replace(/^custom:/, '')));
         } else {
-            background.baseLayerSource(findSource(chosen) || best || findSource('Bing') || backgroundSources[1]);
+            background.baseLayerSource(findSource(chosen) || best || findSource('Bing') || backgroundSources[1] || backgroundSources[0]);
         }
 
         var locator = _.find(backgroundSources, function(d) {
diff --git a/test/spec/modes/add_point.js b/test/spec/modes/add_point.js
index 4cde8c8ad..4f90feefd 100644
--- a/test/spec/modes/add_point.js
+++ b/test/spec/modes/add_point.js
@@ -6,9 +6,11 @@ describe("iD.modes.AddPoint", function() {
 
         context = iD()
             .presets(iD.data.presets)
-            .imagery(iD.data.imagery)
+            .imagery([])
             .container(container);
 
+        context.loadTiles = function () {};
+
         container.call(context.map())
             .append('div')
             .attr('class', 'inspector-wrap');