diff --git a/Makefile b/Makefile
index 34376633c82..81ddb9b3a40 100644
--- a/Makefile
+++ b/Makefile
@@ -465,7 +465,7 @@ PROTO_GOGO_MAPPINGS := $(shell echo \
 
 .PHONY: proto
 proto:
-	# Generate gogo, gRPC-Gateway, swagger, go-validators, gRPC-storage-plugin output.
+	# Generate gogo, swagger, go-validators, gRPC-storage-plugin output.
 	#
 	# -I declares import folders, in order of importance
 	# This is how proto resolves the protofile imports.
@@ -473,8 +473,6 @@ proto:
 	# folders and use the first one it finds.
 	#
 	# --gogo_out generates GoGo Protobuf output with gRPC plugin enabled.
-	# --grpc-gateway_out generates gRPC-Gateway output.
-	# --swagger_out generates an OpenAPI 2.0 specification for our gRPC-Gateway endpoints.
 	# --govalidators_out generates Go validation files for our messages types, if specified.
 	#
 	# The lines starting with Mgoogle/... are proto import replacements,
@@ -495,8 +493,6 @@ proto:
 		$(PROTO_INCLUDES) \
 		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \
 		idl/proto/api_v2/query.proto
-		### grpc-gateway generates 'query.pb.gw.go' that does not respect (gogoproto.customname) = "TraceID"
-		### --grpc-gateway_out=$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/ \
 		### --swagger_out=allow_merge=true:$(PWD)/proto-gen/openapi/ \
 
 	$(PROTOC) \
diff --git a/go.mod b/go.mod
index e8d6e6510c5..1014062d6ca 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,6 @@ require (
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.7.4
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
-	github.com/grpc-ecosystem/grpc-gateway v1.14.5
 	github.com/hashicorp/go-hclog v0.15.0
 	github.com/hashicorp/go-plugin v1.4.0
 	github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
diff --git a/plugin/storage/grpc/proto/storage.proto b/plugin/storage/grpc/proto/storage.proto
index 739f31d1c94..a3e5eb9c31d 100644
--- a/plugin/storage/grpc/proto/storage.proto
+++ b/plugin/storage/grpc/proto/storage.proto
@@ -31,8 +31,6 @@ option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;
 // Enable custom Size method (Required by Marshal and Unmarshal).
 option (gogoproto.sizer_all) = true;
-// Enable registration with golang/protobuf for the grpc-gateway.
-option (gogoproto.goproto_registration) = true;
 
 message GetDependenciesRequest {
     google.protobuf.Timestamp start_time = 1 [
diff --git a/proto-gen/api_v2/collector.pb.go b/proto-gen/api_v2/collector.pb.go
index 8eea19b161a..abbcb728d2e 100644
--- a/proto-gen/api_v2/collector.pb.go
+++ b/proto-gen/api_v2/collector.pb.go
@@ -10,7 +10,6 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	golang_proto "github.com/golang/protobuf/proto"
-	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
 	model "github.com/jaegertracing/jaeger/model"
 	grpc "google.golang.org/grpc"
 	io "io"
diff --git a/proto-gen/api_v2/query.pb.go b/proto-gen/api_v2/query.pb.go
index 39545dc9b1e..494ab103027 100644
--- a/proto-gen/api_v2/query.pb.go
+++ b/proto-gen/api_v2/query.pb.go
@@ -12,7 +12,6 @@ import (
 	_ "github.com/gogo/protobuf/types"
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	golang_proto "github.com/golang/protobuf/proto"
-	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
 	github_com_jaegertracing_jaeger_model "github.com/jaegertracing/jaeger/model"
 	model "github.com/jaegertracing/jaeger/model"
 	grpc "google.golang.org/grpc"
diff --git a/proto-gen/api_v2/sampling.pb.go b/proto-gen/api_v2/sampling.pb.go
index 21515ea0b51..f6d8ac934d3 100644
--- a/proto-gen/api_v2/sampling.pb.go
+++ b/proto-gen/api_v2/sampling.pb.go
@@ -11,7 +11,6 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	golang_proto "github.com/golang/protobuf/proto"
-	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options"
 	grpc "google.golang.org/grpc"
 	io "io"
 	math "math"
diff --git a/tools.go b/tools.go
index f949bce3e8e..9af160a3f93 100644
--- a/tools.go
+++ b/tools.go
@@ -20,7 +20,6 @@ package jaeger
 import (
 	_ "honnef.co/go/tools/cmd/staticcheck"
 
-	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"
 	_ "github.com/mjibson/esc"
 	_ "github.com/securego/gosec/cmd/gosec"
 	_ "github.com/vektra/mockery/cmd/mockery"