diff --git a/chopper/lib/src/annotations.dart b/chopper/lib/src/annotations.dart
index 5d850deb..5ddda966 100644
--- a/chopper/lib/src/annotations.dart
+++ b/chopper/lib/src/annotations.dart
@@ -169,12 +169,39 @@ class Method {
   /// hxxp://path/to/script?user[name]=john&user[surname]=doe&user[age]=21
   final bool useBrackets;
 
+  /// Set to [true] to include query variables with null values. This includes nested maps.
+  /// The default is to exclude them.
+  ///
+  /// NOTE: Empty strings are always included.
+  ///
+  /// ```dart
+  /// @Get(
+  ///   path: '/script',
+  ///   includeNullQueryVars: true,
+  /// )
+  /// Future<Response<String>> getData({
+  ///   @Query('foo') String? foo,
+  ///   @Query('bar') String? bar,
+  ///   @Query('baz') String? baz,
+  /// });
+  ///
+  /// final response = await service.getData(
+  ///   foo: 'foo_val',
+  ///   bar: null, // omitting it would have the same effect
+  ///   baz: 'baz_val',
+  /// );
+  /// ```
+  ///
+  /// The above code produces hxxp://path/to/script&foo=foo_var&bar=&baz=baz_var
+  final bool includeNullQueryVars;
+
   const Method(
     this.method, {
     this.optionalBody = false,
     this.path = '',
     this.headers = const {},
     this.useBrackets = false,
+    this.includeNullQueryVars = false,
   });
 }
 
@@ -186,6 +213,7 @@ class Get extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Get);
 }
 
@@ -199,6 +227,7 @@ class Post extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Post);
 }
 
@@ -210,6 +239,7 @@ class Delete extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Delete);
 }
 
@@ -223,6 +253,7 @@ class Put extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Put);
 }
 
@@ -235,6 +266,7 @@ class Patch extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Patch);
 }
 
@@ -246,6 +278,7 @@ class Head extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Head);
 }
 
@@ -256,6 +289,7 @@ class Options extends Method {
     super.path,
     super.headers,
     super.useBrackets,
+    super.includeNullQueryVars,
   }) : super(HttpMethod.Options);
 }
 
diff --git a/chopper/lib/src/request.dart b/chopper/lib/src/request.dart
index b515ec24..f4189cc9 100644
--- a/chopper/lib/src/request.dart
+++ b/chopper/lib/src/request.dart
@@ -14,6 +14,7 @@ class Request extends http.BaseRequest {
   final bool multipart;
   final List<PartValue> parts;
   final bool useBrackets;
+  final bool includeNullQueryVars;
 
   Request(
     String method,
@@ -25,9 +26,16 @@ class Request extends http.BaseRequest {
     this.multipart = false,
     this.parts = const [],
     this.useBrackets = false,
+    this.includeNullQueryVars = false,
   }) : super(
           method,
-          buildUri(origin, path, parameters, useBrackets: useBrackets),
+          buildUri(
+            origin,
+            path,
+            parameters,
+            useBrackets: useBrackets,
+            includeNullQueryVars: includeNullQueryVars,
+          ),
         ) {
     this.headers.addAll(headers);
   }
@@ -44,6 +52,7 @@ class Request extends http.BaseRequest {
     this.multipart = false,
     this.parts = const [],
     this.useBrackets = false,
+    this.includeNullQueryVars = false,
   })  : origin = url.origin,
         path = url.path,
         parameters = {...url.queryParametersAll, ...?parameters},
@@ -54,6 +63,7 @@ class Request extends http.BaseRequest {
             url.path,
             {...url.queryParametersAll, ...?parameters},
             useBrackets: useBrackets,
+            includeNullQueryVars: includeNullQueryVars,
           ),
         ) {
     this.headers.addAll(headers);
@@ -70,6 +80,7 @@ class Request extends http.BaseRequest {
     bool? multipart,
     List<PartValue>? parts,
     bool? useBrackets,
+    bool? includeNullQueryVars,
   }) =>
       Request(
         method ?? this.method,
@@ -81,6 +92,7 @@ class Request extends http.BaseRequest {
         multipart: multipart ?? this.multipart,
         parts: parts ?? this.parts,
         useBrackets: useBrackets ?? this.useBrackets,
+        includeNullQueryVars: includeNullQueryVars ?? this.includeNullQueryVars,
       );
 
   /// Builds a valid URI from [baseUrl], [url] and [parameters].
@@ -92,6 +104,7 @@ class Request extends http.BaseRequest {
     String url,
     Map<String, dynamic> parameters, {
     bool useBrackets = false,
+    bool includeNullQueryVars = false,
   }) {
     // If the request's url is already a fully qualified URL, we can use it
     // as-is and ignore the baseUrl.
@@ -99,7 +112,11 @@ class Request extends http.BaseRequest {
         ? Uri.parse(url)
         : Uri.parse('${baseUrl.strip('/')}/${url.leftStrip('/')}');
 
-    final String query = mapToQuery(parameters, useBrackets: useBrackets);
+    final String query = mapToQuery(
+      parameters,
+      useBrackets: useBrackets,
+      includeNullQueryVars: includeNullQueryVars,
+    );
 
     return query.isNotEmpty
         ? uri.replace(query: uri.hasQuery ? '${uri.query}&$query' : query)
diff --git a/chopper/lib/src/utils.dart b/chopper/lib/src/utils.dart
index 85ff8c62..299ddead 100644
--- a/chopper/lib/src/utils.dart
+++ b/chopper/lib/src/utils.dart
@@ -56,13 +56,22 @@ final chopperLogger = Logger('Chopper');
 /// Creates a valid URI query string from [map].
 ///
 /// E.g., `{'foo': 'bar', 'ints': [ 1337, 42 ] }` will become 'foo=bar&ints=1337&ints=42'.
-String mapToQuery(Map<String, dynamic> map, {bool useBrackets = false}) =>
-    _mapToQuery(map, useBrackets: useBrackets).join('&');
+String mapToQuery(
+  Map<String, dynamic> map, {
+  bool useBrackets = false,
+  bool includeNullQueryVars = false,
+}) =>
+    _mapToQuery(
+      map,
+      useBrackets: useBrackets,
+      includeNullQueryVars: includeNullQueryVars,
+    ).join('&');
 
 Iterable<_Pair<String, String>> _mapToQuery(
   Map<String, dynamic> map, {
   String? prefix,
   bool useBrackets = false,
+  bool includeNullQueryVars = false,
 }) {
   final Set<_Pair<String, String>> pairs = {};
 
@@ -80,7 +89,12 @@ Iterable<_Pair<String, String>> _mapToQuery(
         pairs.addAll(_iterableToQuery(name, value, useBrackets: useBrackets));
       } else if (value is Map<String, dynamic>) {
         pairs.addAll(
-          _mapToQuery(value, prefix: name, useBrackets: useBrackets),
+          _mapToQuery(
+            value,
+            prefix: name,
+            useBrackets: useBrackets,
+            includeNullQueryVars: includeNullQueryVars,
+          ),
         );
       } else {
         pairs.add(
@@ -88,7 +102,9 @@ Iterable<_Pair<String, String>> _mapToQuery(
         );
       }
     } else {
-      pairs.add(_Pair<String, String>(name, ''));
+      if (includeNullQueryVars) {
+        pairs.add(_Pair<String, String>(name, ''));
+      }
     }
   });
 
diff --git a/chopper/test/base_test.dart b/chopper/test/base_test.dart
index ffdd5d9d..42b2a39c 100644
--- a/chopper/test/base_test.dart
+++ b/chopper/test/base_test.dart
@@ -110,7 +110,7 @@ void main() {
       final httpClient = MockClient((request) async {
         expect(
           request.url.toString(),
-          equals('$baseUrl/test/query?name=&int=&default_value='),
+          equals('$baseUrl/test/query?name='),
         );
         expect(request.method, equals('GET'));
 
@@ -132,7 +132,7 @@ void main() {
       final httpClient = MockClient((request) async {
         expect(
           request.url.toString(),
-          equals('$baseUrl/test/query?name=&int=&default_value=42'),
+          equals('$baseUrl/test/query?name=&default_value=42'),
         );
         expect(request.method, equals('GET'));
 
@@ -923,6 +923,34 @@ void main() {
     );
   });
 
+  test('Include null query vars', () async {
+    final httpClient = MockClient((request) async {
+      expect(
+        request.url.toString(),
+        equals('$baseUrl/test/query_param_include_null_query_vars'
+            '?foo=foo_val'
+            '&bar='
+            '&baz=baz_val'),
+      );
+      expect(request.method, equals('GET'));
+
+      return http.Response('get response', 200);
+    });
+
+    final chopper = buildClient(httpClient);
+    final service = chopper.getService<HttpTestService>();
+
+    final response = await service.getUsingQueryParamIncludeNullQueryVars(
+      foo: 'foo_val',
+      baz: 'baz_val',
+    );
+
+    expect(response.body, equals('get response'));
+    expect(response.statusCode, equals(200));
+
+    httpClient.close();
+  });
+
   test('List query param', () async {
     final httpClient = MockClient((request) async {
       expect(
@@ -1067,4 +1095,88 @@ void main() {
 
     httpClient.close();
   });
+
+  test('Map query param without including null query vars', () async {
+    final httpClient = MockClient((request) async {
+      expect(
+        request.url.toString(),
+        equals('$baseUrl/test/map_query_param'
+            '?value.bar=baz'
+            '&value.etc.abc=def'
+            '&value.etc.mno.opq=rst'
+            '&value.etc.mno.list=a'
+            '&value.etc.mno.list=123'
+            '&value.etc.mno.list=false'),
+      );
+      expect(request.method, equals('GET'));
+
+      return http.Response('get response', 200);
+    });
+
+    final chopper = buildClient(httpClient);
+    final service = chopper.getService<HttpTestService>();
+
+    final response = await service.getUsingMapQueryParam(<String, dynamic>{
+      'bar': 'baz',
+      'zap': null,
+      'etc': <String, dynamic>{
+        'abc': 'def',
+        'ghi': null,
+        'mno': <String, dynamic>{
+          'opq': 'rst',
+          'uvw': null,
+          'list': ['a', 123, false],
+        },
+      },
+    });
+
+    expect(response.body, equals('get response'));
+    expect(response.statusCode, equals(200));
+
+    httpClient.close();
+  });
+
+  test('Map query param including null query vars', () async {
+    final httpClient = MockClient((request) async {
+      expect(
+        request.url.toString(),
+        equals('$baseUrl/test/map_query_param_include_null_query_vars'
+            '?value.bar=baz'
+            '&value.zap='
+            '&value.etc.abc=def'
+            '&value.etc.ghi='
+            '&value.etc.mno.opq=rst'
+            '&value.etc.mno.uvw='
+            '&value.etc.mno.list=a'
+            '&value.etc.mno.list=123'
+            '&value.etc.mno.list=false'),
+      );
+      expect(request.method, equals('GET'));
+
+      return http.Response('get response', 200);
+    });
+
+    final chopper = buildClient(httpClient);
+    final service = chopper.getService<HttpTestService>();
+
+    final response = await service
+        .getUsingMapQueryParamIncludeNullQueryVars(<String, dynamic>{
+      'bar': 'baz',
+      'zap': null,
+      'etc': <String, dynamic>{
+        'abc': 'def',
+        'ghi': null,
+        'mno': <String, dynamic>{
+          'opq': 'rst',
+          'uvw': null,
+          'list': ['a', 123, false],
+        },
+      },
+    });
+
+    expect(response.body, equals('get response'));
+    expect(response.statusCode, equals(200));
+
+    httpClient.close();
+  });
 }
diff --git a/chopper/test/test_service.chopper.dart b/chopper/test/test_service.chopper.dart
index d0a43b5c..fce9c168 100644
--- a/chopper/test/test_service.chopper.dart
+++ b/chopper/test/test_service.chopper.dart
@@ -489,6 +489,28 @@ class _$HttpTestService extends HttpTestService {
     return client.send<dynamic, dynamic>($request);
   }
 
+  @override
+  Future<Response<String>> getUsingQueryParamIncludeNullQueryVars({
+    String? foo,
+    String? bar,
+    String? baz,
+  }) {
+    final String $url = '/test/query_param_include_null_query_vars';
+    final Map<String, dynamic> $params = <String, dynamic>{
+      'foo': foo,
+      'bar': bar,
+      'baz': baz,
+    };
+    final Request $request = Request(
+      'GET',
+      $url,
+      client.baseUrl,
+      parameters: $params,
+      includeNullQueryVars: true,
+    );
+    return client.send<String, String>($request);
+  }
+
   @override
   Future<Response<String>> getUsingListQueryParam(List<String> value) {
     final String $url = '/test/list_query_param';
@@ -530,6 +552,21 @@ class _$HttpTestService extends HttpTestService {
     return client.send<String, String>($request);
   }
 
+  @override
+  Future<Response<String>> getUsingMapQueryParamIncludeNullQueryVars(
+      Map<String, dynamic> value) {
+    final String $url = '/test/map_query_param_include_null_query_vars';
+    final Map<String, dynamic> $params = <String, dynamic>{'value': value};
+    final Request $request = Request(
+      'GET',
+      $url,
+      client.baseUrl,
+      parameters: $params,
+      includeNullQueryVars: true,
+    );
+    return client.send<String, String>($request);
+  }
+
   @override
   Future<Response<String>> getUsingMapQueryParamWithBrackets(
       Map<String, dynamic> value) {
diff --git a/chopper/test/test_service.dart b/chopper/test/test_service.dart
index 7789b361..7d19418c 100644
--- a/chopper/test/test_service.dart
+++ b/chopper/test/test_service.dart
@@ -139,6 +139,13 @@ abstract class HttpTestService extends ChopperService {
   @Post(path: 'no-body')
   Future<Response> noBody();
 
+  @Get(path: '/query_param_include_null_query_vars', includeNullQueryVars: true)
+  Future<Response<String>> getUsingQueryParamIncludeNullQueryVars({
+    @Query('foo') String? foo,
+    @Query('bar') String? bar,
+    @Query('baz') String? baz,
+  });
+
   @Get(path: '/list_query_param')
   Future<Response<String>> getUsingListQueryParam(
     @Query('value') List<String> value,
@@ -154,6 +161,14 @@ abstract class HttpTestService extends ChopperService {
     @Query('value') Map<String, dynamic> value,
   );
 
+  @Get(
+    path: '/map_query_param_include_null_query_vars',
+    includeNullQueryVars: true,
+  )
+  Future<Response<String>> getUsingMapQueryParamIncludeNullQueryVars(
+    @Query('value') Map<String, dynamic> value,
+  );
+
   @Get(path: '/map_query_param_with_brackets', useBrackets: true)
   Future<Response<String>> getUsingMapQueryParamWithBrackets(
     @Query('value') Map<String, dynamic> value,
diff --git a/chopper/test/utils_test.dart b/chopper/test/utils_test.dart
index 649a4651..bf3f8e6f 100644
--- a/chopper/test/utils_test.dart
+++ b/chopper/test/utils_test.dart
@@ -4,7 +4,7 @@ import 'package:test/test.dart';
 void main() {
   group('mapToQuery single', () {
     <Map<String, dynamic>, String>{
-      {'foo': null}: 'foo=',
+      {'foo': null}: '',
       {'foo': ''}: 'foo=',
       {'foo': ' '}: 'foo=%20',
       {'foo': '  '}: 'foo=%20%20',
@@ -28,7 +28,62 @@ void main() {
         test('$map -> $query', () => expect(mapToQuery(map), query)));
   });
 
+  group('mapToQuery single with includeNullQueryVars', () {
+    <Map<String, dynamic>, String>{
+      {'foo': null}: 'foo=',
+      {'foo': ''}: 'foo=',
+      {'foo': ' '}: 'foo=%20',
+      {'foo': '  '}: 'foo=%20%20',
+      {'foo': '\t'}: 'foo=%09',
+      {'foo': '\t\t'}: 'foo=%09%09',
+      {'foo': 'null'}: 'foo=null',
+      {'foo': 'bar'}: 'foo=bar',
+      {'foo': ' bar '}: 'foo=%20bar%20',
+      {'foo': '\tbar\t'}: 'foo=%09bar%09',
+      {'foo': '\t\tbar\t\t'}: 'foo=%09%09bar%09%09',
+      {'foo': 123}: 'foo=123',
+      {'foo': 0}: 'foo=0',
+      {'foo': -0.01}: 'foo=-0.01',
+      {'foo': '0.00'}: 'foo=0.00',
+      {'foo': 123.456}: 'foo=123.456',
+      {'foo': 123.450}: 'foo=123.45',
+      {'foo': -123.456}: 'foo=-123.456',
+      {'foo': true}: 'foo=true',
+      {'foo': false}: 'foo=false',
+    }.forEach(
+      (map, query) => test(
+        '$map -> $query',
+        () => expect(mapToQuery(map, includeNullQueryVars: true), query),
+      ),
+    );
+  });
+
   group('mapToQuery multiple', () {
+    <Map<String, dynamic>, String>{
+      {'foo': null, 'baz': null}: '',
+      {'foo': '', 'baz': ''}: 'foo=&baz=',
+      {'foo': null, 'baz': ''}: 'baz=',
+      {'foo': '', 'baz': null}: 'foo=',
+      {'foo': 'bar', 'baz': ''}: 'foo=bar&baz=',
+      {'foo': null, 'baz': 'etc'}: 'baz=etc',
+      {'foo': '', 'baz': 'etc'}: 'foo=&baz=etc',
+      {'foo': 'bar', 'baz': 'etc'}: 'foo=bar&baz=etc',
+      {'foo': 'null', 'baz': 'null'}: 'foo=null&baz=null',
+      {'foo': ' ', 'baz': ' '}: 'foo=%20&baz=%20',
+      {'foo': '\t', 'baz': '\t'}: 'foo=%09&baz=%09',
+      {'foo': 123, 'baz': 456}: 'foo=123&baz=456',
+      {'foo': 0, 'baz': 0}: 'foo=0&baz=0',
+      {'foo': '0.00', 'baz': '0.00'}: 'foo=0.00&baz=0.00',
+      {'foo': 123.456, 'baz': 789.012}: 'foo=123.456&baz=789.012',
+      {'foo': 123.450, 'baz': 789.010}: 'foo=123.45&baz=789.01',
+      {'foo': -123.456, 'baz': -789.012}: 'foo=-123.456&baz=-789.012',
+      {'foo': true, 'baz': true}: 'foo=true&baz=true',
+      {'foo': false, 'baz': false}: 'foo=false&baz=false',
+    }.forEach((map, query) =>
+        test('$map -> $query', () => expect(mapToQuery(map), query)));
+  });
+
+  group('mapToQuery multiple with includeNullQueryVars', () {
     <Map<String, dynamic>, String>{
       {'foo': null, 'baz': null}: 'foo=&baz=',
       {'foo': '', 'baz': ''}: 'foo=&baz=',
@@ -49,8 +104,12 @@ void main() {
       {'foo': -123.456, 'baz': -789.012}: 'foo=-123.456&baz=-789.012',
       {'foo': true, 'baz': true}: 'foo=true&baz=true',
       {'foo': false, 'baz': false}: 'foo=false&baz=false',
-    }.forEach((map, query) =>
-        test('$map -> $query', () => expect(mapToQuery(map), query)));
+    }.forEach(
+      (map, query) => test(
+        '$map -> $query',
+        () => expect(mapToQuery(map, includeNullQueryVars: true), query),
+      ),
+    );
   });
 
   group('mapToQuery lists', () {
@@ -90,11 +149,57 @@ void main() {
         'bar': 'baz',
         'etc': '',
         'xyz': null,
-      }: 'foo=bar&foo=baz&foo=etc&bar=baz&etc=&xyz=',
+      }: 'foo=bar&foo=baz&foo=etc&bar=baz&etc=',
     }.forEach((map, query) =>
         test('$map -> $query', () => expect(mapToQuery(map), query)));
   });
 
+  group('mapToQuery lists with includeNullQueryVars', () {
+    <Map<String, dynamic>, String>{
+      {
+        'foo': ['bar', 'baz', 'etc'],
+      }: 'foo=bar&foo=baz&foo=etc',
+      {
+        'foo': ['bar', 123, 456.789, 0, -123, -456.789],
+      }: 'foo=bar&foo=123&foo=456.789&foo=0&foo=-123&foo=-456.789',
+      {
+        'foo': ['', 'baz', 'etc'],
+      }: 'foo=baz&foo=etc',
+      {
+        'foo': ['bar', '', 'etc'],
+      }: 'foo=bar&foo=etc',
+      {
+        'foo': ['bar', 'baz', ''],
+      }: 'foo=bar&foo=baz',
+      {
+        'foo': [null, 'baz', 'etc'],
+      }: 'foo=baz&foo=etc',
+      {
+        'foo': ['bar', null, 'etc'],
+      }: 'foo=bar&foo=etc',
+      {
+        'foo': ['bar', 'baz', null],
+      }: 'foo=bar&foo=baz',
+      {
+        'foo': ['bar', 'baz', ' '],
+      }: 'foo=bar&foo=baz&foo=%20',
+      {
+        'foo': ['bar', 'baz', '\t'],
+      }: 'foo=bar&foo=baz&foo=%09',
+      {
+        'foo': ['bar', 'baz', 'etc'],
+        'bar': 'baz',
+        'etc': '',
+        'xyz': null,
+      }: 'foo=bar&foo=baz&foo=etc&bar=baz&etc=&xyz=',
+    }.forEach(
+      (map, query) => test(
+        '$map -> $query',
+        () => expect(mapToQuery(map, includeNullQueryVars: true), query),
+      ),
+    );
+  });
+
   group('mapToQuery lists with brackets', () {
     <Map<String, dynamic>, String>{
       {
@@ -132,7 +237,7 @@ void main() {
         'bar': 'baz',
         'etc': '',
         'xyz': null,
-      }: 'foo%5B%5D=bar&foo%5B%5D=baz&foo%5B%5D=etc&bar=baz&etc=&xyz=',
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz&foo%5B%5D=etc&bar=baz&etc=',
     }.forEach(
       (map, query) => test(
         '$map -> $query',
@@ -144,6 +249,55 @@ void main() {
     );
   });
 
+  group('mapToQuery lists with brackets with includeNullQueryVars', () {
+    <Map<String, dynamic>, String>{
+      {
+        'foo': ['bar', 'baz', 'etc'],
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz&foo%5B%5D=etc',
+      {
+        'foo': ['bar', 123, 456.789, 0, -123, -456.789],
+      }: 'foo%5B%5D=bar&foo%5B%5D=123&foo%5B%5D=456.789&foo%5B%5D=0&foo%5B%5D=-123&foo%5B%5D=-456.789',
+      {
+        'foo': ['', 'baz', 'etc'],
+      }: 'foo%5B%5D=baz&foo%5B%5D=etc',
+      {
+        'foo': ['bar', '', 'etc'],
+      }: 'foo%5B%5D=bar&foo%5B%5D=etc',
+      {
+        'foo': ['bar', 'baz', ''],
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz',
+      {
+        'foo': [null, 'baz', 'etc'],
+      }: 'foo%5B%5D=baz&foo%5B%5D=etc',
+      {
+        'foo': ['bar', null, 'etc'],
+      }: 'foo%5B%5D=bar&foo%5B%5D=etc',
+      {
+        'foo': ['bar', 'baz', null],
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz',
+      {
+        'foo': ['bar', 'baz', ' '],
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz&foo%5B%5D=%20',
+      {
+        'foo': ['bar', 'baz', '\t'],
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz&foo%5B%5D=%09',
+      {
+        'foo': ['bar', 'baz', 'etc'],
+        'bar': 'baz',
+        'etc': '',
+        'xyz': null,
+      }: 'foo%5B%5D=bar&foo%5B%5D=baz&foo%5B%5D=etc&bar=baz&etc=&xyz=',
+    }.forEach(
+      (map, query) => test(
+        '$map -> $query',
+        () => expect(
+          mapToQuery(map, useBrackets: true, includeNullQueryVars: true),
+          query,
+        ),
+      ),
+    );
+  });
+
   group('mapToQuery maps', () {
     <Map<String, dynamic>, String>{
       {
@@ -154,7 +308,7 @@ void main() {
       }: 'foo.bar=',
       {
         'foo': {'bar': null},
-      }: 'foo.bar=',
+      }: '',
       {
         'foo': {'bar': ' '},
       }: 'foo.bar=%20',
@@ -178,7 +332,7 @@ void main() {
           'tab': '\t',
           'list': ['a', 123, false],
         },
-      }: 'foo.bar=baz&foo.int=123&foo.double=456.789&foo.zero=0&foo.negInt=-123&foo.negDouble=-456.789&foo.emptyString=&foo.nullValue=&foo.space=%20&foo.tab=%09&foo.list=a&foo.list=123&foo.list=false',
+      }: 'foo.bar=baz&foo.int=123&foo.double=456.789&foo.zero=0&foo.negInt=-123&foo.negDouble=-456.789&foo.emptyString=&foo.space=%20&foo.tab=%09&foo.list=a&foo.list=123&foo.list=false',
       {
         'foo': {'bar': 'baz'},
         'etc': 'xyz',
@@ -206,7 +360,142 @@ void main() {
         test('$map -> $query', () => expect(mapToQuery(map), query)));
   });
 
+  group('mapToQuery maps with includeNullQueryVars', () {
+    <Map<String, dynamic>, String>{
+      {
+        'foo': {'bar': 'baz'},
+      }: 'foo.bar=baz',
+      {
+        'foo': {'bar': ''},
+      }: 'foo.bar=',
+      {
+        'foo': {'bar': null},
+      }: 'foo.bar=',
+      {
+        'foo': {'bar': ' '},
+      }: 'foo.bar=%20',
+      {
+        'foo': {'bar': '\t'},
+      }: 'foo.bar=%09',
+      {
+        'foo': {'bar': 'baz', 'etc': 'xyz', 'space': ' ', 'tab': '\t'},
+      }: 'foo.bar=baz&foo.etc=xyz&foo.space=%20&foo.tab=%09',
+      {
+        'foo': {
+          'bar': 'baz',
+          'int': 123,
+          'double': 456.789,
+          'zero': 0,
+          'negInt': -123,
+          'negDouble': -456.789,
+          'emptyString': '',
+          'nullValue': null,
+          'space': ' ',
+          'tab': '\t',
+          'list': ['a', 123, false],
+        },
+      }: 'foo.bar=baz&foo.int=123&foo.double=456.789&foo.zero=0&foo.negInt=-123&foo.negDouble=-456.789&foo.emptyString=&foo.nullValue=&foo.space=%20&foo.tab=%09&foo.list=a&foo.list=123&foo.list=false',
+      {
+        'foo': {'bar': 'baz'},
+        'etc': 'xyz',
+      }: 'foo.bar=baz&etc=xyz',
+      {
+        'foo': {
+          'bar': 'baz',
+          'zap': 'abc',
+          'etc': {
+            'abc': 'def',
+            'ghi': 'jkl',
+            'mno': {
+              'opq': 'rst',
+              'uvw': 'xyz',
+              'aab': [
+                'bbc',
+                'ccd',
+                'eef',
+              ],
+            },
+          },
+        },
+      }: 'foo.bar=baz&foo.zap=abc&foo.etc.abc=def&foo.etc.ghi=jkl&foo.etc.mno.opq=rst&foo.etc.mno.uvw=xyz&foo.etc.mno.aab=bbc&foo.etc.mno.aab=ccd&foo.etc.mno.aab=eef',
+    }.forEach(
+      (map, query) => test(
+        '$map -> $query',
+        () => expect(mapToQuery(map, includeNullQueryVars: true), query),
+      ),
+    );
+  });
+
   group('mapToQuery maps with brackets', () {
+    <Map<String, dynamic>, String>{
+      {
+        'foo': {'bar': 'baz'},
+      }: 'foo%5Bbar%5D=baz',
+      {
+        'foo': {'bar': ''},
+      }: 'foo%5Bbar%5D=',
+      {
+        'foo': {'bar': null},
+      }: '',
+      {
+        'foo': {'bar': ' '},
+      }: 'foo%5Bbar%5D=%20',
+      {
+        'foo': {'bar': '\t'},
+      }: 'foo%5Bbar%5D=%09',
+      {
+        'foo': {'bar': 'baz', 'etc': 'xyz', 'space': ' ', 'tab': '\t'},
+      }: 'foo%5Bbar%5D=baz&foo%5Betc%5D=xyz&foo%5Bspace%5D=%20&foo%5Btab%5D=%09',
+      {
+        'foo': {
+          'bar': 'baz',
+          'int': 123,
+          'double': 456.789,
+          'zero': 0,
+          'negInt': -123,
+          'negDouble': -456.789,
+          'emptyString': '',
+          'nullValue': null,
+          'space': ' ',
+          'tab': '\t',
+          'list': ['a', 123, false],
+        },
+      }: 'foo%5Bbar%5D=baz&foo%5Bint%5D=123&foo%5Bdouble%5D=456.789&foo%5Bzero%5D=0&foo%5BnegInt%5D=-123&foo%5BnegDouble%5D=-456.789&foo%5BemptyString%5D=&foo%5Bspace%5D=%20&foo%5Btab%5D=%09&foo%5Blist%5D%5B%5D=a&foo%5Blist%5D%5B%5D=123&foo%5Blist%5D%5B%5D=false',
+      {
+        'foo': {'bar': 'baz'},
+        'etc': 'xyz',
+      }: 'foo%5Bbar%5D=baz&etc=xyz',
+      {
+        'foo': {
+          'bar': 'baz',
+          'zap': 'abc',
+          'etc': {
+            'abc': 'def',
+            'ghi': 'jkl',
+            'mno': {
+              'opq': 'rst',
+              'uvw': 'xyz',
+              'aab': [
+                'bbc',
+                'ccd',
+                'eef',
+              ],
+            },
+          },
+        },
+      }: 'foo%5Bbar%5D=baz&foo%5Bzap%5D=abc&foo%5Betc%5D%5Babc%5D=def&foo%5Betc%5D%5Bghi%5D=jkl&foo%5Betc%5D%5Bmno%5D%5Bopq%5D=rst&foo%5Betc%5D%5Bmno%5D%5Buvw%5D=xyz&foo%5Betc%5D%5Bmno%5D%5Baab%5D%5B%5D=bbc&foo%5Betc%5D%5Bmno%5D%5Baab%5D%5B%5D=ccd&foo%5Betc%5D%5Bmno%5D%5Baab%5D%5B%5D=eef',
+    }.forEach(
+      (map, query) => test(
+        '$map -> $query',
+        () => expect(
+          mapToQuery(map, useBrackets: true),
+          query,
+        ),
+      ),
+    );
+  });
+
+  group('mapToQuery maps with brackets with includeNullQueryVars', () {
     <Map<String, dynamic>, String>{
       {
         'foo': {'bar': 'baz'},
@@ -268,7 +557,7 @@ void main() {
       (map, query) => test(
         '$map -> $query',
         () => expect(
-          mapToQuery(map, useBrackets: true),
+          mapToQuery(map, useBrackets: true, includeNullQueryVars: true),
           query,
         ),
       ),
diff --git a/chopper_generator/analysis_options.yaml b/chopper_generator/analysis_options.yaml
index 3a82dc3b..2caa0f09 100644
--- a/chopper_generator/analysis_options.yaml
+++ b/chopper_generator/analysis_options.yaml
@@ -14,7 +14,7 @@ dart_code_metrics:
     cyclomatic-complexity: 20
     number-of-arguments: 4
     maximum-nesting-level: 5
-    number-of-parameters: 6
+    number-of-parameters: 10
     source-lines-of-code: 250
   metrics-exclude:
     - test/**
diff --git a/chopper_generator/lib/src/generator.dart b/chopper_generator/lib/src/generator.dart
index 6dda3c4a..2ccd6cd3 100644
--- a/chopper_generator/lib/src/generator.dart
+++ b/chopper_generator/lib/src/generator.dart
@@ -311,6 +311,8 @@ class ChopperGenerator extends GeneratorForAnnotation<chopper.ChopperApi> {
 
       final bool useBrackets = getUseBrackets(method);
 
+      final bool includeNullQueryVars = getIncludeNullQueryVars(method);
+
       blocks.add(
         declareFinal(_requestVar, type: refer('Request'))
             .assign(
@@ -321,6 +323,7 @@ class ChopperGenerator extends GeneratorForAnnotation<chopper.ChopperApi> {
                 useHeaders: headers != null,
                 hasParts: hasParts,
                 useBrackets: useBrackets,
+                includeNullQueryVars: includeNullQueryVars,
               ),
             )
             .statement,
@@ -494,6 +497,7 @@ class ChopperGenerator extends GeneratorForAnnotation<chopper.ChopperApi> {
     bool useQueries = false,
     bool useHeaders = false,
     bool useBrackets = false,
+    bool includeNullQueryVars = false,
   }) {
     final List<Expression> params = [
       literal(getMethodName(method)),
@@ -524,6 +528,10 @@ class ChopperGenerator extends GeneratorForAnnotation<chopper.ChopperApi> {
       namedParams['useBrackets'] = literalBool(useBrackets);
     }
 
+    if (includeNullQueryVars) {
+      namedParams['includeNullQueryVars'] = literalBool(includeNullQueryVars);
+    }
+
     return refer('Request').newInstance(params, namedParams);
   }
 
@@ -631,6 +639,9 @@ String getMethodName(ConstantReader method) =>
 bool getUseBrackets(ConstantReader method) =>
     method.peek('useBrackets')?.boolValue ?? false;
 
+bool getIncludeNullQueryVars(ConstantReader method) =>
+    method.peek('includeNullQueryVars')?.boolValue ?? false;
+
 extension DartTypeExtension on DartType {
   bool get isNullable => nullabilitySuffix != NullabilitySuffix.none;
 }