diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 688177e5..79664267 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -492,9 +492,10 @@ working_time_accumulated: working_time_accumulated})
     # Render statistics page for one specific external user
 
     if policy(@exercise).detailed_statistics?
-      submissions = Submission.where(user: @external_user,
-        exercise_id: @exercise.id).in_study_group_of(current_user).order('created_at')
-      @show_autosaves = params[:show_autosaves] == 'true'
+      submissions = Submission.where(user: @external_user, exercise: @exercise)
+                              .in_study_group_of(current_user)
+                              .order('created_at')
+      @show_autosaves = params[:show_autosaves] == 'true' || submissions.none? {|s|s.cause != 'autosave'}
       submissions = submissions.where.not(cause: 'autosave') unless @show_autosaves
       interventions = UserExerciseIntervention.where('user_id = ?  AND exercise_id = ?', @external_user.id,
         @exercise.id)