diff --git a/assembly/src/sample-conf/activemq-stomp.xml b/assembly/src/sample-conf/activemq-stomp.xml
index 13b151bd37..fccdf1089d 100644
--- a/assembly/src/sample-conf/activemq-stomp.xml
+++ b/assembly/src/sample-conf/activemq-stomp.xml
@@ -115,6 +115,11 @@
             <transportConnector name="stomp+nio" uri="stomp+nio://0.0.0.0:61613?transport.closeAsync=false"/>
         </transportConnectors>
 
+        <!-- destroy the spring context on shutdown to stop jetty -->
+        <shutdownHooks>
+            <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.activemq.hooks.SpringContextHook" />
+        </shutdownHooks>
+
     </broker>
 
     <!--