diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index e449c7442..146094988 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -303,7 +303,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
         TaskEditFragment taskEditFragment = getTaskEditFragment();
         if (taskEditFragment != null) {
             taskEditFragment.discardButtonClick();
-        } else {
+        } else if (!isFinishing()) {
             super.onBackPressed();
         }
     }
diff --git a/src/main/java/org/tasks/ui/CalendarControlSet.java b/src/main/java/org/tasks/ui/CalendarControlSet.java
index 21e56761a..9d18d242d 100644
--- a/src/main/java/org/tasks/ui/CalendarControlSet.java
+++ b/src/main/java/org/tasks/ui/CalendarControlSet.java
@@ -23,6 +23,7 @@ import com.todoroo.astrid.gcal.GCalHelper;
 import org.tasks.R;
 import org.tasks.activities.CalendarSelectionActivity;
 import org.tasks.injection.ForActivity;
+import org.tasks.preferences.PermissionChecker;
 import org.tasks.preferences.Preferences;
 
 import javax.inject.Inject;
@@ -48,6 +49,7 @@ public class CalendarControlSet extends TaskEditControlFragment {
     @Inject GCalHelper gcalHelper;
     @Inject Preferences preferences;
     @Inject @ForActivity Context context;
+    @Inject PermissionChecker permissionChecker;
 
     private String calendarId;
     private String calendarName;
@@ -62,7 +64,7 @@ public class CalendarControlSet extends TaskEditControlFragment {
             eventUri = savedInstanceState.getString(EXTRA_URI);
             calendarName = savedInstanceState.getString(EXTRA_NAME);
             calendarId = savedInstanceState.getString(EXTRA_ID);
-        } else if (isNewTask) {
+        } else if (isNewTask && permissionChecker.canAccessCalendars()) {
             calendarId = preferences.getDefaultCalendar();
             if (!Strings.isNullOrEmpty(calendarId)) {
                 AndroidCalendar defaultCalendar = gcalHelper.getCalendar(calendarId);