diff --git a/co_sim_io/includes/communication/base_socket_communication.hpp b/co_sim_io/includes/communication/base_socket_communication.hpp
index 3f26756a..5650f843 100644
--- a/co_sim_io/includes/communication/base_socket_communication.hpp
+++ b/co_sim_io/includes/communication/base_socket_communication.hpp
@@ -39,7 +39,19 @@ class CO_SIM_IO_API BaseSocketCommunication : public Communication
         std::shared_ptr<DataCommunicator> I_DataComm)
         : Communication(I_Settings, I_DataComm) {}
 
-    ~BaseSocketCommunication() override;
+    /// Destructor
+    ~BaseSocketCommunication() override
+    {
+        CO_SIM_IO_TRY
+
+        if (GetIsConnected()) {
+            CO_SIM_IO_INFO("CoSimIO") << "Warning: Disconnect was not performed, attempting automatic disconnection!" << std::endl;
+            Info tmp;
+            Disconnect(tmp);
+        }
+
+        CO_SIM_IO_CATCH
+    }
 
     Info ConnectDetail(const Info& I_Info) override;
 
diff --git a/co_sim_io/sources/communication/base_socket_communication.cpp b/co_sim_io/sources/communication/base_socket_communication.cpp
index 8f71c4c1..e8c9878d 100644
--- a/co_sim_io/sources/communication/base_socket_communication.cpp
+++ b/co_sim_io/sources/communication/base_socket_communication.cpp
@@ -18,20 +18,6 @@
 namespace CoSimIO {
 namespace Internals {
 
-template<class TSocketType>
-BaseSocketCommunication<TSocketType>::~BaseSocketCommunication()
-{
-    CO_SIM_IO_TRY
-
-    if (GetIsConnected()) {
-        CO_SIM_IO_INFO("CoSimIO") << "Warning: Disconnect was not performed, attempting automatic disconnection!" << std::endl;
-        Info tmp;
-        Disconnect(tmp);
-    }
-
-    CO_SIM_IO_CATCH
-}
-
 template<class TSocketType>
 Info BaseSocketCommunication<TSocketType>::ConnectDetail(const Info& I_Info)
 {