diff --git a/language-support/ts/daml-types/index.test.ts b/language-support/ts/daml-types/index.test.ts
index 6d8310bc68ae..445a922ebb96 100644
--- a/language-support/ts/daml-types/index.test.ts
+++ b/language-support/ts/daml-types/index.test.ts
@@ -71,6 +71,15 @@ describe('@daml/types', () => {
       expect(m2.get(k)).toEqual(makeArr(m2.values())[makeArr(m2.keys()).findIndex((l) => _.isEqual(k, l))]);
     }
   });
+  it('nested genmap', () => {
+    const {encode, decoder} = Map(Text, Map(Text, Text));
+    const decoded: Map<Text, Map<Text, Text>> =
+      emptyMap<Text, Map<Text, Text>>().set("a", emptyMap<Text, Text>().set("b", "c"));
+    const decode = (u: unknown): Map<Text, Map<Text, Text>> => decoder.runWithException(u);
+    const encoded = [["a", [["b", "c"]]]];
+    expect(encode(decoded)).toEqual(encoded);
+    expect(decode(encoded)).toEqual(decoded);
+  });
 });
 
 test('memo', () => {
diff --git a/language-support/ts/daml-types/index.ts b/language-support/ts/daml-types/index.ts
index a2f11af56f76..48c5e8fc34a4 100644
--- a/language-support/ts/daml-types/index.ts
+++ b/language-support/ts/daml-types/index.ts
@@ -518,5 +518,5 @@ export const emptyMap = <K, V>(): Map<K, V> => new MapImpl<K, V>([]);
  */
 export const Map = <K, V>(kd: Serializable<K>, vd: Serializable<V>): Serializable<Map<K, V>> => ({
   decoder: jtv.array(jtv.tuple([kd.decoder, vd.decoder])).map(kvs => new MapImpl(kvs)),
-  encode: (m: Map<K, V>): unknown => m.entriesArray(),
+  encode: (m: Map<K, V>): unknown => m.entriesArray().map(e => [kd.encode(e[0]), vd.encode(e[1])]),
 });