diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 00c989780..6c3eea65f 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -51,6 +51,7 @@ class ReportsController < ApplicationController
   # Report grouped by modules
   def new
     @templates = Extends::REPORT_TEMPLATES
+    @active_template = @templates.one? ? @templates.keys[0] : nil
     @repositories = Repository.accessible_by_teams(current_team).active.select(:id, :name)
     @report = current_team.reports.new
   end
@@ -114,6 +115,7 @@ class ReportsController < ApplicationController
   def edit
     @edit = true
     @templates = Extends::REPORT_TEMPLATES
+    @active_template = @report.settings[:template]
     @repositories = Repository.accessible_by_teams(current_team).active.select(:id, :name)
     @report.settings = Report::DEFAULT_SETTINGS if @report.settings.blank?
 
diff --git a/app/views/reports/wizard/_project_template_selector.html.erb b/app/views/reports/wizard/_project_template_selector.html.erb
index a0003ebbc..52e8269d3 100644
--- a/app/views/reports/wizard/_project_template_selector.html.erb
+++ b/app/views/reports/wizard/_project_template_selector.html.erb
@@ -14,7 +14,7 @@
     <div class='template-selector'>
       <%= label_tag :templateSelector, t('projects.reports.wizard.first_step.select_template') %>
       <%= select_tag :templateSelector,
-                     options_for_select(@templates.invert, report.settings[:template]),
+                     options_for_select(@templates.invert, @active_template),
                      prompt: t('projects.reports.wizard.first_step.select_template'),
                      data: {
                        disable_on_load: report.settings[:template].blank?,