diff --git a/controllers/api.js b/controllers/api.js
index ac3fea54ad5..a0cbc812d83 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -28,16 +28,22 @@ exports.apiBrowser = function(req, res) {
 // being logged in is not enough
 
 exports.foursquare = function(req, res) {
-  var geo = geoip.lookup('4.17.136.0' || req.connection.remoteAddress);
-
-  foursquare.Venues.getTrending(geo.ll[0], geo.ll[1], { limit: 5 }, req.user.tokens.foursquare, function(err, results) {
+  if (req.user.tokens && req.user.tokens.foursquare) {
+    var geo = geoip.lookup('4.17.136.0' || req.connection.remoteAddress);
+    foursquare.Venues.getTrending(geo.ll[0], geo.ll[1], { limit: 5 }, req.user.tokens.foursquare, function(err, results) {
+      res.render('api/foursquare', {
+        title: 'Foursquare API',
+        user: req.user,
+        venues: results.venues
+      });
+    });
+  } else {
     res.render('api/foursquare', {
       title: 'Foursquare API',
-      user: req.user,
-      venues: results.venues
+      user: req.user
     });
+  }
 
-  });
 
 };
 
diff --git a/views/api/foursquare.jade b/views/api/foursquare.jade
index e604a3e18de..381cd51b351 100644
--- a/views/api/foursquare.jade
+++ b/views/api/foursquare.jade
@@ -6,28 +6,28 @@ block content
       i.fa.fa-foursquare
       |  Foursquare API
 
-  if !user.tokens.foursquare
+  if !(user.tokens && user.tokens.foursquare)
     a.btn.btn-large.btn-primary(href='/auth/foursquare') Get Foursquare Token
+  else
+    ul.nav.nav-pills(style='margin-bottom: 15px;')
+      li.active
+        a(href='#venues', data-toggle='tab') Venues
+      li
+        a(href='#users', data-toggle='tab') Users
+      li
+        a(href='#checkins', data-toggle='tab') Checkins
+    div.tab-content
+      #venues.tab-pane.fade.active.in
+        .lead
+          i.fa.fa-signal
+          |  Trending Venues
+        .list-group
+          for venue in venues
+            a.list-group-item(href='#{venue.url}') #{venue.name}
+              .text-muted
+                small #{venue.location.address}, #{venue.location.city}, #{venue.location.state}
+      #users.tab-pane.fade
+        p TODO: Users
 
-  ul.nav.nav-pills(style='margin-bottom: 15px;')
-    li.active
-      a(href='#venues', data-toggle='tab') Venues
-    li
-      a(href='#users', data-toggle='tab') Users
-    li
-      a(href='#checkins', data-toggle='tab') Checkins
-  div.tab-content
-    #venues.tab-pane.fade.active.in
-      .lead
-        i.fa.fa-signal
-        |  Trending Venues
-      .list-group
-        for venue in venues
-          a.list-group-item(href='#{venue.url}') #{venue.name}
-            .text-muted
-              small #{venue.location.address}, #{venue.location.city}, #{venue.location.state}
-    #users.tab-pane.fade
-      p TODO: Users
-
-    #checkins.tab-pane.fade
-      p TODO: Checkins
\ No newline at end of file
+      #checkins.tab-pane.fade
+        p TODO: Checkins
\ No newline at end of file