diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java b/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
index beadb1ad..3082ec25 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/http/ComputerDetails.java
@@ -1,7 +1,6 @@
 package com.limelight.nvstream.http;
 
 import java.security.cert.X509Certificate;
-import java.util.UUID;
 
 
 public class ComputerDetails {
@@ -10,7 +9,7 @@ public class ComputerDetails {
 	}
 
 	// Persistent attributes
-	public UUID uuid;
+	public String uuid;
 	public String name;
 	public String localAddress;
 	public String remoteAddress;
diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java b/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
index 8bf8aa7b..db4f8dd6 100644
--- a/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
+++ b/moonlight-common/src/main/java/com/limelight/nvstream/http/NvHTTP.java
@@ -255,7 +255,7 @@ public class NvHTTP {
 			details.name = "UNKNOWN";
 		}
 
-		details.uuid = UUID.fromString(getXmlString(serverInfo, "uniqueid"));
+		details.uuid = getXmlString(serverInfo, "uniqueid");
 		details.macAddress = getXmlString(serverInfo, "mac");
 		details.localAddress = getXmlString(serverInfo, "LocalIP");