diff --git a/modules/services/wikidata.js b/modules/services/wikidata.js
index a3cd287fb..1e242114a 100644
--- a/modules/services/wikidata.js
+++ b/modules/services/wikidata.js
@@ -87,6 +87,10 @@ export default {
     languagesToQuery: function() {
         return localizer.localeCodes().map(function(code) {
             return code.toLowerCase();
+        }).filter(function(code) {
+            // HACK: en-us isn't a wikidata language. We should really be filtering by
+            // the languages known to be supported by wikidata.
+            return code !== 'en-us';
         });
     },
 
diff --git a/modules/ui/fields/wikidata.js b/modules/ui/fields/wikidata.js
index 5de081165..681e0743a 100644
--- a/modules/ui/fields/wikidata.js
+++ b/modules/ui/fields/wikidata.js
@@ -84,8 +84,10 @@ export function uiFieldWikidata(field, context) {
             .call(combobox.fetcher(fetchWikidataItems));
 
         combobox.on('accept', function(d) {
-            _qid = d.id;
-            change();
+            if (d) {
+                _qid = d.id;
+                change();
+            }
         }).on('cancel', function() {
             setLabelForEntity();
         });