diff --git a/Gemfile b/Gemfile
index 67accc6f7..7556bfd13 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,10 +41,17 @@ gem 'ecs-logging', require: 'ecs_logging/logger'
 gem 'elasticsearch', require: nil
 gem 'fakeredis', require: nil
 gem 'faraday', require: nil
-gem 'graphql', require: nil
-if !defined?(JRUBY_VERSION) && RUBY_VERSION < '2.5'
-  gem 'google-protobuf', '< 3.12'
+if RUBY_VERSION < '2.7'
+  gem 'graphql', '< 2.1', require: nil
+else
+  gem 'graphql', require: nil
+end
+
+if !defined?(JRUBY_VERSION)
+  gem 'google-protobuf', '< 3.12' if RUBY_VERSION < '2.5'
+  gem 'google-protobuf', '< 3.25' if RUBY_VERSION < '2.7' && RUBY_VERSION > '2.5'
 end
+
 gem 'grpc' if !defined?(JRUBY_VERSION) && RUBY_VERSION < '3.0'
 gem 'json'
 gem 'json-schema', require: nil