diff --git a/Microsoft.Azure.Amqp/Amqp/Transaction/Controller.cs b/Microsoft.Azure.Amqp/Amqp/Transaction/Controller.cs
index ff978357..5ece5cd8 100644
--- a/Microsoft.Azure.Amqp/Amqp/Transaction/Controller.cs
+++ b/Microsoft.Azure.Amqp/Amqp/Transaction/Controller.cs
@@ -107,6 +107,7 @@ static void OnLinkOpen(IAsyncResult asyncResult)
             try
             {
                 thisPtr.controllerLink.EndOpen(asyncResult);
+                thisPtr.controllerLink.SafeAddClosed((sender, args) => { thisPtr.SafeClose(); });
             }
             catch (Exception exception) when (!Fx.IsFatal(exception))
             {