diff --git a/ChatApp/src/client/ClientConsole.java b/ChatApp/src/client/ClientConsole.java
index 720a082..61b75ee 100644
--- a/ChatApp/src/client/ClientConsole.java
+++ b/ChatApp/src/client/ClientConsole.java
@@ -144,10 +144,9 @@ public class ClientConsole implements ClientListener {
 
 	@Override
 	public void handleRoomList(List<String> roomNames) {
-		System.out.println("Rooms :");
-		for (String room : roomNames) {
-			System.out.println("\t" + room);
-		}
+		System.out.println(roomNames.isEmpty()
+				? "No rooms available"
+				: "Rooms : \n\t" + String.join("\n\t", roomNames));
 	}
 
 	@Override