diff --git a/app/graphql/types/base_field.rb b/app/graphql/types/base_field.rb
index ee23146f711a9b4bd9b38e6fb07dd40bed99a0d5..95db116d6f91f426d882d15d874ad517495083d4 100644
--- a/app/graphql/types/base_field.rb
+++ b/app/graphql/types/base_field.rb
@@ -60,8 +60,6 @@ module Types
       # involved with the request.
       if @calls_gitaly && Gitlab::GitalyClient.get_request_count == 0
         raise "Gitaly is called for field '#{name}' - please add `calls_gitaly: true` to the field declaration"
-      elsif !@calls_gitaly && Gitlab::GitalyClient.get_request_count > 0
-        raise "Gitaly not called for field '#{name}' - please remove `calls_gitaly: true` from the field declaration"
       end
     rescue => e
       Gitlab::Sentry.track_exception(e)
diff --git a/spec/graphql/types/base_field_spec.rb b/spec/graphql/types/base_field_spec.rb
index ebdfa3eaf4d27c672ede378d4b323e7bbd7b7a11..d73608725088605166e0621b8a9f9a87ddc0bdb5 100644
--- a/spec/graphql/types/base_field_spec.rb
+++ b/spec/graphql/types/base_field_spec.rb
@@ -127,10 +127,6 @@ describe Types::BaseField do
         it 'does not raise an error if calls_gitaly is true' do
           expect { gitaly_field.send(:calls_gitaly_check) }.not_to raise_error
         end
-
-        it 'raises an error if calls_gitaly is not decalared' do
-          expect { no_gitaly_field.send(:calls_gitaly_check) }.to raise_error(/please remove `calls_gitaly: true`/)
-        end
       end
     end
   end