diff --git a/net_api_generator/generator.py b/net_api_generator/generator.py
index 31e126841e6a027c2918c78312fe51171c3147cf..59cedd9c666cd058349ddaa648630b9250181216 100644
--- a/net_api_generator/generator.py
+++ b/net_api_generator/generator.py
@@ -269,19 +269,19 @@ def typescript(output_dir, middleware_openapi):
     def map_netdb_type_to_typescript_type(data_type):
         # mapping from netdb_type to typescript types
         if data_type['format_literal'] is not None and data_type['json_name'] == 'string':
-            return data_type['json_name']
+            return data_type['json_name'] + '|null'
         elif data_type['name'] == 'text_array':
-            return 'string[]'
+            return 'string[]' + '|null'
         elif re.match(r'^integer.*_array$', data_type['name']) is not None:
-            return 'number[]'
+            return 'number[]' + '|null'
         elif data_type['json_name'] == 'array':
-            return 'string[]'
+            return 'string[]' + '|null'
         elif data_type['json_name'] == 'json':
-            return 'any'
+            return 'any' + '|null'
         elif data_type['json_name'] == 'object':
-            return 'Object'
+            return 'Object' + '|null'
         else:
-            return data_type['json_name']
+            return data_type['json_name'] + '| null'
 
     def generate_code_header()->str:
         return "// -- AUTOGENERATED --\n\n"
@@ -538,7 +538,7 @@ def typescript(output_dir, middleware_openapi):
     generated_api_calls = generate_api_calls(loader.api_functions)
     write_generated_code_to_file(code_header, imports, generated_type_definitions, generated_api_calls)
 
-    middleware_generator.typescript(middleware_openapi)
+#    middleware_generator.typescript(middleware_openapi)
 
 @cli.command(name='es-webpack')
 @click.option('--output-dir', default='src/api-services.gen/')