diff --git a/app/views/courses/_recent_feedback.html.erb b/app/views/courses/_recent_feedback.html.erb
index c8efc64b1f9..e6f71886743 100644
--- a/app/views/courses/_recent_feedback.html.erb
+++ b/app/views/courses/_recent_feedback.html.erb
@@ -28,7 +28,14 @@
   cache(['recent_feedback_render3', @current_user&.course_nickname_hash, recent_feedback || 'blank_feedback', Time.zone.utc_offset].cache_key) do
     assignment = recent_feedback.assignment
     context = recent_feedback.assignment.context
-    url = context_url(context, :context_assignment_submission_url, :assignment_id => recent_feedback.assignment_id, :id=>@current_user.id)
+    if recent_feedback.assignment.a2_enabled?
+      context_symbol = :context_assignment_url
+      context_params = {:id => recent_feedback.assignment_id}
+    else
+      context_symbol = :context_assignment_submission_url
+      context_params = {:assignment_id => recent_feedback.assignment_id, :id => @current_user.id}
+    end
+    url = context_url(context, context_symbol, context_params)
     grade = readable_grade(recent_feedback)
     score = recent_feedback.score
     comment = recent_feedback.last_teacher_comment
diff --git a/spec/views/courses/_recent_feedback.html.erb_spec.rb b/spec/views/courses/_recent_feedback.html.erb_spec.rb
index db024019fb5..aa134206f3c 100644
--- a/spec/views/courses/_recent_feedback.html.erb_spec.rb
+++ b/spec/views/courses/_recent_feedback.html.erb_spec.rb
@@ -75,4 +75,27 @@ describe "/courses/_recent_feedback" do
     expect(response.body).to include("25,734 out of 25,734")
     expect(response.body).to include('something different')
   end
+
+  it 'contains the new url when assignments 2 student view is enabled' do
+    @course.enable_feature!(:assignments_2_student)
+    @assignment.update!(points_possible: 25734)
+    @assignment.grade_student(@user, grade: 25734, grader: @teacher)
+    @submission.reload
+
+    render :partial => "courses/recent_feedback", object: @submission, locals: {is_hidden: false}
+    url = context_url(@assignment.context, :context_assignment_url, id: @assignment.id)
+    expect(response.body).to include("\"#{url}\"")
+  end
+
+  it 'contains the old url when assignments 2 student view is disabled' do
+    @assignment.update!(points_possible: 25734)
+    @assignment.grade_student(@user, grade: 25734, grader: @teacher)
+    @submission.reload
+
+    assign(:current_user, @user)
+
+    render :partial => "courses/recent_feedback", object: @submission, locals: {is_hidden: false}
+    url = context_url(@assignment.context, :context_assignment_submission_url, assignment_id: @assignment.id, id:@user.id)
+    expect(response.body).to include("\"#{url}\"")
+  end
 end