diff --git a/CHANGELOG b/CHANGELOG
index e5cdcc2ecc3dec0da8c4eded62c99d163ba1743a..3e459f8b2ba3cf02597f4fc3849100492c1daa30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+v 8.8.2 (unreleased)
+  - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources
+
 v 8.8.1
   - Add documentation for the "Health Check" feature
   - Allow anonymous users to access a public project's pipelines
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index f5079f92444ced909ec9de1c14ec9a747d2b4575..9a14954b4a71e1f5cdfaeba8e8a8bb7da9f3877d 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -7,7 +7,7 @@ class ApplicationSetting < ActiveRecord::Base
 
   serialize :restricted_visibility_levels
   serialize :import_sources
-  serialize :disabled_oauth_sign_in_sources
+  serialize :disabled_oauth_sign_in_sources, Array
   serialize :restricted_signup_domains, Array
   attr_accessor :restricted_signup_domains_raw