diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go
index 672425389..5265051ce 100644
--- a/etcdserver/api/v3rpc/interceptor.go
+++ b/etcdserver/api/v3rpc/interceptor.go
@@ -56,8 +56,7 @@ func newUnaryInterceptor(s *etcdserver.EtcdServer) grpc.UnaryServerInterceptor {
 			}
 		}
 
-		resp, err := handler(ctx, req)
-		return resp, err
+		return handler(ctx, req)
 	}
 }
 
@@ -210,8 +209,7 @@ func newStreamInterceptor(s *etcdserver.EtcdServer) grpc.StreamServerInterceptor
 			}
 		}
 
-		err := handler(srv, ss)
-		return err
+		return handler(srv, ss)
 	}
 }