diff --git a/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopology.cs b/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopology.cs
index 893cdc6..b5ec284 100644
--- a/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopology.cs
+++ b/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopology.cs
@@ -112,12 +112,12 @@ namespace HeliosDisplayManagement.Shared.NVIDIA
         
         public static bool operator ==(SurroundTopology left, SurroundTopology right)
         {
-            return Equals(left, right);
+            return Equals(left, right) || left?.Equals(right) == true;
         }
         
         public static bool operator !=(SurroundTopology left, SurroundTopology right)
         {
-            return !Equals(left, right);
+            return !(left == right);
         }
 
         /// <inheritdoc />
diff --git a/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopologyDisplay.cs b/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopologyDisplay.cs
index 6608b9d..9f6ed21 100644
--- a/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopologyDisplay.cs
+++ b/HeliosDisplayManagement.Shared/NVIDIA/SurroundTopologyDisplay.cs
@@ -54,12 +54,12 @@ namespace HeliosDisplayManagement.Shared.NVIDIA
 
         public static bool operator ==(SurroundTopologyDisplay left, SurroundTopologyDisplay right)
         {
-            return Equals(left, right);
+            return Equals(left, right) || left?.Equals(right) == true;
         }
 
         public static bool operator !=(SurroundTopologyDisplay left, SurroundTopologyDisplay right)
         {
-            return !Equals(left, right);
+            return !(left == right);
         }
 
         /// <inheritdoc />
diff --git a/HeliosDisplayManagement.Shared/Profile.cs b/HeliosDisplayManagement.Shared/Profile.cs
index 20dce88..3775428 100644
--- a/HeliosDisplayManagement.Shared/Profile.cs
+++ b/HeliosDisplayManagement.Shared/Profile.cs
@@ -145,12 +145,12 @@ namespace HeliosDisplayManagement.Shared
 
         public static bool operator ==(Profile left, Profile right)
         {
-            return Equals(left, right);
+            return Equals(left, right) || left?.Equals(right) == true;
         }
 
         public static bool operator !=(Profile left, Profile right)
         {
-            return !Equals(left, right);
+            return !(left == right);
         }
 
         public static void RefreshActiveStatus()
diff --git a/HeliosDisplayManagement.Shared/Topology/Path.cs b/HeliosDisplayManagement.Shared/Topology/Path.cs
index b6c1809..4acccf4 100644
--- a/HeliosDisplayManagement.Shared/Topology/Path.cs
+++ b/HeliosDisplayManagement.Shared/Topology/Path.cs
@@ -42,12 +42,12 @@ namespace HeliosDisplayManagement.Shared.Topology
 
         public static bool operator ==(Path left, Path right)
         {
-            return Equals(left, right);
+            return Equals(left, right) || left?.Equals(right) == true;
         }
 
         public static bool operator !=(Path left, Path right)
         {
-            return !Equals(left, right);
+            return !(left == right);
         }
 
         /// <inheritdoc />
diff --git a/HeliosDisplayManagement.Shared/Topology/PathTarget.cs b/HeliosDisplayManagement.Shared/Topology/PathTarget.cs
index 022df55..ba115f5 100644
--- a/HeliosDisplayManagement.Shared/Topology/PathTarget.cs
+++ b/HeliosDisplayManagement.Shared/Topology/PathTarget.cs
@@ -58,12 +58,12 @@ namespace HeliosDisplayManagement.Shared.Topology
 
         public static bool operator ==(PathTarget left, PathTarget right)
         {
-            return Equals(left, right);
+            return Equals(left, right) || left?.Equals(right) == true;
         }
 
         public static bool operator !=(PathTarget left, PathTarget right)
         {
-            return !Equals(left, right);
+            return !(left == right);
         }
 
         /// <inheritdoc />