diff --git a/src/view-map.js b/src/view-map.js
index 8b63fe15..3a86a468 100644
--- a/src/view-map.js
+++ b/src/view-map.js
@@ -293,7 +293,9 @@ my.Map = Backbone.View.extend({
         // TODO: mustache?
         html = ''
         for (key in doc.attributes){
-          html += '<div><strong>' + key + '</strong>: '+ doc.attributes[key] + '</div>'
+          if (!(self.state.get('geomField') && key == self.state.get('geomField'))){
+            html += '<div><strong>' + key + '</strong>: '+ doc.attributes[key] + '</div>';
+          }
         }
         feature.properties = {popupContent: html};
 
diff --git a/test/view-map.test.js b/test/view-map.test.js
index 430eda86..aa07f9a8 100644
--- a/test/view-map.test.js
+++ b/test/view-map.test.js
@@ -111,8 +111,11 @@ test('Popup', function () {
   assertPresent(popup);
 
   var text = popup.text();
+  ok((text.indexOf('geom') === -1))
   _.each(view.model.fields.toJSON(),function(field){
-    ok((text.indexOf(field.id) !== -1))
+    if (field.id != 'geom'){
+      ok((text.indexOf(field.id) !== -1))
+    }
   });
 
   view.remove();