diff --git a/botocore/data/aws/swf/2012-01-25.json b/botocore/data/aws/swf/2012-01-25.json
index cd40204dcb..3ce8726a47 100644
--- a/botocore/data/aws/swf/2012-01-25.json
+++ b/botocore/data/aws/swf/2012-01-25.json
@@ -7278,6 +7278,13 @@
                 "input_token": "nextPageToken",
                 "output_token": "nextPageToken",
                 "result_key": "events",
+                "non_aggregate_keys": [
+                    "taskToken",
+                    "startedEventId",
+                    "workflowExecution",
+                    "workflowType",
+                    "previousStartedEventId"
+                ],
                 "py_input_token": "next_page_token"
             }
         },
@@ -8837,6 +8844,13 @@
             "input_token": "nextPageToken",
             "output_token": "nextPageToken",
             "result_key": "events",
+            "non_aggregate_keys": [
+                "taskToken",
+                "startedEventId",
+                "workflowExecution",
+                "workflowType",
+                "previousStartedEventId"
+            ],
             "py_input_token": "next_page_token"
         }
     },
diff --git a/services/swf.extra.json b/services/swf.extra.json
index 3bb932f54c..473fe11c87 100644
--- a/services/swf.extra.json
+++ b/services/swf.extra.json
@@ -42,7 +42,14 @@
       "limit_key": "maximumPageSize",
       "input_token": "nextPageToken",
       "output_token": "nextPageToken",
-      "result_key": "events"
+      "result_key": "events",
+      "non_aggregate_keys": [
+        "taskToken",
+        "startedEventId",
+        "workflowExecution",
+        "workflowType",
+        "previousStartedEventId"
+      ]
     }
   }
 }