diff --git a/shared/js/events.ts b/shared/js/events.ts
index 8d2350fc..6af8c8ef 100644
--- a/shared/js/events.ts
+++ b/shared/js/events.ts
@@ -284,7 +284,7 @@ export class Registry<Events extends { [key: string]: any } = { [key: string]: a
                     }
                     index++;
                 }
-            })
+            });
         });
     }
 
diff --git a/shared/js/tree/Client.ts b/shared/js/tree/Client.ts
index 26a29c51..86911cf0 100644
--- a/shared/js/tree/Client.ts
+++ b/shared/js/tree/Client.ts
@@ -9,7 +9,7 @@ import {Group, GroupManager, GroupTarget, GroupType} from "../permission/GroupMa
 import PermissionType from "../permission/PermissionType";
 import {createErrorModal, createInputModal} from "../ui/elements/Modal";
 import * as htmltags from "../ui/htmltags";
-import {CommandResult, PlaylistSong} from "../connection/ServerConnectionDeclaration";
+import {CommandResult} from "../connection/ServerConnectionDeclaration";
 import {ChannelEntry} from "./Channel";
 import {ConnectionHandler, ViewReasonId} from "../ConnectionHandler";
 import {createServerGroupAssignmentModal} from "../ui/modal/ModalGroupAssignment";
@@ -290,7 +290,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
     }
 
     getStatusIcon() : ClientIcon {
-        if (this.properties.client_type_exact == ClientType.CLIENT_QUERY) {
+        if (this.properties.client_type == ClientType.CLIENT_QUERY) {
             return ClientIcon.ServerQuery;
         } else if (this.properties.client_away) {
             return ClientIcon.Away;
diff --git a/shared/js/ui/frames/side/ClientInfoRenderer.tsx b/shared/js/ui/frames/side/ClientInfoRenderer.tsx
index 354fc110..3f13c544 100644
--- a/shared/js/ui/frames/side/ClientInfoRenderer.tsx
+++ b/shared/js/ui/frames/side/ClientInfoRenderer.tsx
@@ -436,6 +436,24 @@ const ServerGroupRenderer = () => {
     );
 };
 
+const ConnectedClientInfoBlock = () => {
+    const client = useContext(ClientContext);
+    if(client.type === "query" || client.type === "none") {
+        return null;
+    }
+
+    return (
+        <React.Fragment key={"info"}>
+            <ClientOnlineSince />
+            <ClientCountry />
+            <ClientForumAccount />
+            <ClientVolume />
+            <ClientVersion />
+            <ClientStatus />
+        </React.Fragment>
+    );
+}
+
 const ClientInfoProvider = () => {
     const events = useContext(EventsContext);
 
@@ -468,12 +486,7 @@ const ClientInfoProvider = () => {
                 </div>
                 <div className={cssStyle.generalInfo}>
                     <div className={cssStyle.block + " " + cssStyle.blockLeft}>
-                        <ClientOnlineSince />
-                        <ClientCountry />
-                        <ClientForumAccount />
-                        <ClientVolume />
-                        <ClientVersion />
-                        <ClientStatus />
+                        <ConnectedClientInfoBlock />
                     </div>
                     <div className={cssStyle.block + " " + cssStyle.blockRight}>
                         <ChannelGroupRenderer />