diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 6e7a90e7d9c..9b02a68a202 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -202,11 +202,7 @@ class ApplicationSetting < ActiveRecord::Base
   end
 
   def repository_storages
-    value = read_attribute(:repository_storages)
-    value = [value] if value.is_a?(String)
-    value = [] if value.nil?
-
-    value
+    Array(read_attribute(:repository_storages))
   end
 
   # repository_storage is still required in the API. Remove in 9.0