diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee
index 3d0e6a8f8d..4b742b3eb5 100644
--- a/src/server/serverRoutes.coffee
+++ b/src/server/serverRoutes.coffee
@@ -13,7 +13,8 @@ module.exports = (expressApp, root, derby) ->
   expressApp.get '/terms', (req, res) ->
     staticPages.render 'terms', res
 
-  expressApp.get '/v1/users/:uid/calendar.ics', (req, res) ->
+  expressApp.get '/v1/users/:uid/calendar.ics', (req, res, next) ->
+    return next() #disable for now
     {uid} = req.params
     {apiToken} = req.query
 
@@ -23,6 +24,7 @@ module.exports = (expressApp, root, derby) ->
     require('mongoskin').db(process.env.NODE_DB_URI, {safe:true}).collection('users').find({_id:uid, apiToken:apiToken}).toArray (err, result) ->
       return res.send(500, err) if err
 #      tasks = result.at(0).get('tasks')
+      return next() if _.isEmpty(result)
       tasks = result[0].tasks
       tasksWithDates = _.filter tasks, (task) -> !!task.date
 
diff --git a/views/app/index.html b/views/app/index.html
index 182c73f20e..242b0e2f50 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -340,8 +340,8 @@ do a find for the string after "→"
             {#if _user.history.todos}
               <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
             {/}
-            &nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}"><img src='/img/calendar_ical.png' title="iCal" alt="iCal" rel=tooltip /></a>
-            &nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>
+            <!--&nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}"><img src='/img/calendar_ical.png' title="iCal" alt="iCal" rel=tooltip /></a>
+            &nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
         </span>
         <div id="todos-chart" style="display:none;"></div>
         <ul class="nav nav-tabs">
@@ -609,10 +609,10 @@ do a find for the string after "→"
           </label>
         </div>
       {else if equal(:task.type, 'todo')}
-        <div class=control-group>
+        <!--<div class=control-group>
             <label>Date</label>
             <input type="date" value="{:task.date}" />
-        </div>
+        </div>-->
       {/}
       <button type=submit class="btn">Save & Close</button>
     </form>