diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb
index 4e74838c..af3c5b1f 100644
--- a/app/controllers/dmsf_workflows_controller.rb
+++ b/app/controllers/dmsf_workflows_controller.rb
@@ -24,7 +24,7 @@ class DmsfWorkflowsController < ApplicationController
   self.main_menu = false
 
   before_action :find_model_object, except: %i[create new index assign assignment]
-  before_action :find_project, except: %i[assignment]
+  before_action :find_project
   before_action :authorize_custom
   before_action :permissions?, only: %i[new_action assignment start]
   before_action :approver_candidates, only: %i[remove_step show reorder_steps add_step]
@@ -216,7 +216,7 @@ class DmsfWorkflowsController < ApplicationController
         revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
         begin
           if revision
-            @project = revision.dmsf_file.project
+            @project = revision.dmsf_file.project unless @project
             revision.set_workflow(params[:dmsf_workflow_id], params[:action])
             revision.assign_workflow(params[:dmsf_workflow_id])
             if request.post?
diff --git a/test/functional/dmsf_workflow_controller_test.rb b/test/functional/dmsf_workflow_controller_test.rb
index de759499..2ebf678f 100644
--- a/test/functional/dmsf_workflow_controller_test.rb
+++ b/test/functional/dmsf_workflow_controller_test.rb
@@ -359,8 +359,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
            id: @wf1.id,
            dmsf_workflow_id: @wf1.id,
            dmsf_file_revision_id: @revision2.id,
-           action: 'assignment',
-           project_id: @project1.id,
+           action: 'assignment'
          }
     assert_response :redirect
   end