diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c7b78cdf..7862a5479 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 * [#1559](https://github.com/ruby-grape/grape/pull/1559): You can once again pass `nil` to optional attributes with `values` validation set - [@ghiculescu](https://github.com/ghiculescu).
 * [#1562](https://github.com/ruby-grape/grape/pull/1562): Fix rainbow gem installation failure above ruby 2.3.3 on travis-ci - [@brucehsu](https://github.com/brucehsu).
+* [#1561](https://github.com/ruby-grape/grape/pull/1561): Fix performance issue introduced by duplicated calls in StackableValue#[] - [@brucehsu](https://github.com/brucehsu).
 
 ### 0.19.1 (1/9/2017)
 
diff --git a/lib/grape/util/stackable_values.rb b/lib/grape/util/stackable_values.rb
index 72612af5e..a6c8179bd 100644
--- a/lib/grape/util/stackable_values.rb
+++ b/lib/grape/util/stackable_values.rb
@@ -15,8 +15,8 @@ def [](name)
         return @frozen_values[name] if @frozen_values.key? name
 
         value = []
-        value.concat(@inherited_values[name]) if @inherited_values[name]
-        value.concat(@new_values[name]) if @new_values[name]
+        value.concat(@inherited_values[name] || [])
+        value.concat(@new_values[name] || [])
         value
       end