diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs b/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs
index 5d81ead2..aa644678 100644
--- a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs	
+++ b/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs	
@@ -114,17 +114,6 @@ namespace PepperDash.Essentials.Core
 			Port.SerialDataReceived += Port_SerialDataReceived;
 		}
 
-		/// <summary>
-		/// Destructor
-		/// </summary>
-		~ComPortController()
-		{
-			if (Port == null)
-				return;
-
-			Port.SerialDataReceived -= Port_SerialDataReceived;
-		}
-
 		void Port_SerialDataReceived(ComPort ReceivingComPort, ComPortSerialDataEventArgs args)
 		{
 			OnDataReceived(args.SerialData);
@@ -162,6 +151,7 @@ namespace PepperDash.Essentials.Core
 			if (Port == null)
 				return false;
 
+			Port.SerialDataReceived -= Port_SerialDataReceived;
 			return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
 		}