diff --git a/bin/rails b/bin/rails
index 57d0505314d..fce3537f7cb 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-if !ENV["RAILS_ENV"] && (ARGV == ["s"] || ARGV["server"])
+if !ENV["RAILS_ENV"] && (ARGV == ["s"] || ARGV == ["server"])
+  ENV["UNICORN_PORT"] = "9292"
   exec File.expand_path("unicorn", __dir__)
 end
 
diff --git a/bin/unicorn b/bin/unicorn
index b890a840688..4bd8e9e7d1e 100755
--- a/bin/unicorn
+++ b/bin/unicorn
@@ -21,6 +21,7 @@ if !ARGV.include?("-E") &&
 
   ENV["UNICORN_PORT"] ||= "9292"
   ENV["UNICORN_SIDEKIQS"] ||= "1"
+
 end
 
 load Gem.bin_path('unicorn', 'unicorn')