diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb
index 87316335b..3f8cf85e3 100644
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -2,8 +2,8 @@ class TasksController < AuthenticatedController
   include ProjectScoped
   include TasksHelper
 
-  skip_before_action :set_project, if: -> { params[:project_id].blank? }
-  skip_before_action :set_nodes, if: -> { params[:project_id].blank? }
+  skip_before_action :set_project, unless: -> { current_project }
+  skip_before_action :set_nodes, unless: -> { current_project }
 
   def index
     @default_columns = ['Title', 'Methodology', 'Due Date', 'Assigned']