diff --git a/Gemfile b/Gemfile
index eece3227..6fdf11e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,6 @@ gemspec
 version = ENV['RAILS_VERSION'] || '4.2'
 
 if version == 'master'
-  gem 'rack', github: 'rack/rack'
   gem 'arel', github: 'rails/arel'
   gem 'rails', github: 'rails/rails'
   git 'https://github.com/rails/rails.git' do
diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec
index 56f6972d..6e0bbf47 100644
--- a/active_model_serializers.gemspec
+++ b/active_model_serializers.gemspec
@@ -28,6 +28,8 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'actionpack', rails_versions
   # 'activesupport', rails_versions
+  # restrict rack version as long as grape < 1.3.0 is supported
+  spec.add_runtime_dependency 'rack', '<= 2.0.8'
   # 'rack'
   # 'rack-test', '~> 0.6.2'