diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index ec02fc15d35..5f14581ac69 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -25,8 +25,13 @@ class Projects::CompareController < Projects::ApplicationController
   end
 
   def create
-    redirect_to namespace_project_compare_path(@project.namespace, @project,
+    if params[:from].blank? || params[:to].blank?
+      flash[:alert] = "You must select from & to branches"
+      redirect_to namespace_project_compare_index_path
+    else
+      redirect_to namespace_project_compare_path(@project.namespace, @project,
                                                params[:from], params[:to])
+    end
   end
 
   private
diff --git a/changelogs/unreleased/i--25814-500-error.yml b/changelogs/unreleased/i--25814-500-error.yml
new file mode 100644
index 00000000000..cd55ede84c8
--- /dev/null
+++ b/changelogs/unreleased/i--25814-500-error.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Compare page throws 500 error when any branch/reference is not selected
+merge_request: 8492
+author: Martin Cabrera