diff --git a/.generator/src/generator/templates/model_generic.j2 b/.generator/src/generator/templates/model_generic.j2
index 61bfcab4004a..8ebe035e1b7e 100644
--- a/.generator/src/generator/templates/model_generic.j2
+++ b/.generator/src/generator/templates/model_generic.j2
@@ -101,6 +101,11 @@
         {%- endif %}
       end
 {%- endfor %}
+{%- if model.get("x-keep-typed-in-additional-properties") %}
+{%- for attr, definition in model.get("properties", {}).items() %}
+      self.additional_properties[:'{{ attr|attribute_name }}'] = self.{{ attr|attribute_name }} if attributes.key?(:'{{ attr|attribute_name }}')
+{%- endfor %}
+{%- endif %}
     end
 
 {%- set ns = namespace(hasValidation=False) %}