diff --git a/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java b/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
index 0c0cc005..2b5fe44c 100644
--- a/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
+++ b/app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
@@ -1,6 +1,7 @@
 package com.limelight.nvstream.http;
 
 import java.security.cert.X509Certificate;
+import java.util.Objects;
 
 
 public class ComputerDetails {
@@ -31,7 +32,7 @@ public class ComputerDetails {
 
         @Override
         public int hashCode() {
-            return address.hashCode();
+            return Objects.hash(address, port);
         }
 
         @Override