diff --git a/aws/components/topic/setup.ftl b/aws/components/topic/setup.ftl
index 03901edf..6421b55d 100644
--- a/aws/components/topic/setup.ftl
+++ b/aws/components/topic/setup.ftl
@@ -247,6 +247,29 @@
                         /]
                     [/#if]
                 [/#list]
+
+                [#list solution.Endpoints as id, endpoint]
+                    [#local deliveryPolicy = {}]
+                    [#switch endpoint.Protocol ]
+                        [#case "http"]
+                        [#case "https" ]
+                            [#local deliveryPolicy = getSNSDeliveryPolicy(solution.DeliveryPolicy) ]
+                            [#break]
+                    [/#switch]
+
+                    [#if deploymentSubsetRequired(TOPIC_COMPONENT_TYPE, true)]
+                        [@createSNSSubscription
+                            id=formatId(subscriptionId, "endpoint", id)
+                            topicId=topicId
+                            endpoint=endpoint.Address
+                            protocol=endpoint.Protocol
+                            rawMessageDelivery=solution.RawMessageDelivery
+                            deliveryPolicy=deliveryPolicy
+                            filterPolicy=filterPolicy
+                            dependencies=subscriptionDependencies
+                        /]
+                    [/#if]
+                [/#list]
                 [#break]
         [/#switch]
     [/#list]