diff --git a/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java b/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java
index 960ac8c1..9ac9f87d 100644
--- a/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java
+++ b/src/main/java/org/qortal/api/websocket/ActiveChatsWebSocket.java
@@ -102,7 +102,8 @@ public class ActiveChatsWebSocket extends ApiWebSocket {
 	private Encoding getTargetEncoding(Session session) {
 		// Default to Base58 if not specified, for backwards support
 		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
-		String encoding = (queryParams.get("encoding") != null && !queryParams.get("encoding").isEmpty()) ? queryParams.get("encoding").get(0) : "BASE58";
+		List<String> encodingList = queryParams.get("encoding");
+		String encoding = (encodingList != null && encodingList.size() == 1) ? encodingList.get(0) : "BASE58";
 		return Encoding.valueOf(encoding);
 	}
 
diff --git a/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java b/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java
index e443ee78..3046c1c1 100644
--- a/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java
+++ b/src/main/java/org/qortal/api/websocket/ChatMessagesWebSocket.java
@@ -180,7 +180,8 @@ public class ChatMessagesWebSocket extends ApiWebSocket {
 	private Encoding getTargetEncoding(Session session) {
 		// Default to Base58 if not specified, for backwards support
 		Map<String, List<String>> queryParams = session.getUpgradeRequest().getParameterMap();
-		String encoding = (queryParams.get("encoding") != null && !queryParams.get("encoding").isEmpty()) ? queryParams.get("encoding").get(0) : "BASE58";
+		List<String> encodingList = queryParams.get("encoding");
+		String encoding = (encodingList != null && encodingList.size() == 1) ? encodingList.get(0) : "BASE58";
 		return Encoding.valueOf(encoding);
 	}