diff --git a/libraries/botframework-connector/src/connectorApi/models/mappers.ts b/libraries/botframework-connector/src/connectorApi/models/mappers.ts
index 146eef1521..738b41b20d 100644
--- a/libraries/botframework-connector/src/connectorApi/models/mappers.ts
+++ b/libraries/botframework-connector/src/connectorApi/models/mappers.ts
@@ -399,6 +399,11 @@ export const Entity: CompositeMapper = {
           className: "ChannelAccount"
         }
       }
+    },
+    additionalProperties: {
+      type: {
+        name: "Object"
+      }
     }
   }
 };
@@ -711,12 +716,7 @@ export const Activity: CompositeMapper = {
           element: {
             type: {
               name: "Composite",
-              className: "Entity",
-              additionalProperties: {
-                type: {
-                  name: "Object"
-                }
-              }
+              className: "Entity"
             }
           }
         }