diff --git a/das-dn/third_party/AdsLib/Sockets.cpp b/das-dn/third_party/AdsLib/Sockets.cpp
index 3488877b..d6bd11f6 100644
--- a/das-dn/third_party/AdsLib/Sockets.cpp
+++ b/das-dn/third_party/AdsLib/Sockets.cpp
@@ -174,7 +174,7 @@ int Socket::GetError() const
 
 bool Socket::IsConnected() const
 {
-    return IsValid() &&m_Connected;
+    return IsValid() && m_Connected;
 }
 
 void Socket::Shutdown()
diff --git a/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp b/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp
index 31f6c8fb..7584bcaa 100644
--- a/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp
+++ b/das-dn/third_party/AdsLib/Standalone/AmsConnection.cpp
@@ -85,9 +85,12 @@ AmsConnection::~AmsConnection()
 {
     if (socket.IsConnected())
     {
-        socket.Shutdown();
         receiver.join();
     }
+    if (socket.IsValid())
+    {
+        socket.Shutdown();
+    }
 }
 
 SharedDispatcher AmsConnection::CreateNotifyMapping(uint32_t hNotify, std::shared_ptr<Notification> notification)