diff --git a/CShocker/Devices/Abstract/Api.cs b/CShocker/Devices/Abstract/Api.cs
index a371871..22cc552 100644
--- a/CShocker/Devices/Abstract/Api.cs
+++ b/CShocker/Devices/Abstract/Api.cs
@@ -92,7 +92,7 @@ public abstract class Api : IDisposable
 
     public override int GetHashCode()
     {
-        return HashCode.Combine(ApiType);
+        return ApiType.GetHashCode();
     }
 
     public void Dispose()
diff --git a/CShocker/Devices/Abstract/OpenShockApi.cs b/CShocker/Devices/Abstract/OpenShockApi.cs
index 5db4cfc..d9fda5c 100644
--- a/CShocker/Devices/Abstract/OpenShockApi.cs
+++ b/CShocker/Devices/Abstract/OpenShockApi.cs
@@ -27,7 +27,7 @@ public abstract class OpenShockApi : Api
 
     private bool Equals(OpenShockApi other)
     {
-        return base.Equals(other) && Endpoint == other.Endpoint && ApiKey == other.ApiKey;
+        return base.Equals(other) && Endpoint.Equals(other.Endpoint) && ApiKey.Equals(other.ApiKey);
     }
 
     public override int GetHashCode()