diff --git a/app/assets/javascripts/maps.js.coffee b/app/assets/javascripts/maps.js.coffee
index fa566f0e..37ee4f73 100644
--- a/app/assets/javascripts/maps.js.coffee
+++ b/app/assets/javascripts/maps.js.coffee
@@ -7,15 +7,12 @@ $(document).ready ->
     ).addTo map
 
     $.getJSON '/maps.json', (json) ->
-      points = []
       L.geoJson(json,
         onEachFeature: (feature, layer) ->
-          points += [feature.geometry.coordinates[0], feature.geometry.coordinates[1]]
           # Does this feature have a property named popupContent?
           if (feature.properties && feature.properties.popupContent)
               layer.bindPopup(feature.properties.popupContent)
       ).addTo map
-      console.log L.bounds(points[0], points[1])
 
 
   $('.events #map').each ->
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 818a9613..91af5ce2 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -6,7 +6,7 @@ class MapsController < ApplicationController
     respond_to do |format|
       format.html
       format.json do
-        render json: Event.moderated.future.map { |event| event.to_json }
+        render json: Event.moderated.future.geo.map { |event| event.to_json }
       end
     end
   end
diff --git a/app/models/event.rb b/app/models/event.rb
index 5919d598..7b04d46c 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -48,6 +48,7 @@ class Event < ActiveRecord::Base
   end)
   scope :region, -> region { where 'region = ? or locality', region }
   scope :tag, -> tag { where 'tags like ?', "%#{tag}%" }
+  scope :geo, -> { where 'latitude is not null and longitude is not null' }
 
   before_validation on: :create do
     self.submission_time = DateTime.now