diff --git a/src/App.tsx b/src/App.tsx
index 0186e1f..0a7f10e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -5,53 +5,13 @@ import { useEffect, useState } from "react";
 import Viewer from "./Viewer";
 import { useSearchParams } from "react-router-dom";
 import { TS5ConnectionHandler } from "@handlers/teamspeak/connectionHandler";
+import useTSRemoteApp from "./hooks/useTSRemoteApp";
 
 export default function App() {
   const [searchParams] = useSearchParams();
-
-  const [clients, setClients] = useState<IClient[]>([]);
-  const [channels, setChannels] = useState<IChannel[]>([]);
-  const [connections, setConnections] = useState<IConnection[]>([]);
-  const [activeConnectionId, setActiveConnectionId] = useState<number>(1);
-
-  const [currentConnection, setCurrentConnection] = useState<IConnection | undefined>(undefined);
-  const [currentChannel, setCurrentChannel] = useState<IChannel | undefined>(undefined);
-  const [currentClient, setCurrentClient] = useState<IClient | undefined>(undefined);
-
-  function setCurrentStates() {
-    const currentConnection = connections.find((connection) => connection.id === activeConnectionId);
-    setCurrentConnection(currentConnection);
-
-    if (currentConnection) {
-      const currentClient = clients.find((client) => client.id === currentConnection.clientId);
-      setCurrentClient(currentClient);
-      if (currentClient) {
-        const currentChannel = channels.find((channel) => channel.id === currentClient.channel?.id);
-        setCurrentChannel(currentChannel);
-        if (currentChannel) {
-          return currentChannel;
-        }
-      }
-    }
-  }
-
-  useEffect(() => {
-    const remoteAppPort = searchParams.get("remoteAppPort");
-
-    console.log(searchParams.get("hideNonTalking"));
-    const tsConnection: ITS5ConnectionHandler = new TS5ConnectionHandler(
-      parseInt(remoteAppPort ?? "5899"),
-      setConnections,
-      setChannels,
-      setClients,
-      setActiveConnectionId
-    );
-    tsConnection.connect();
-  }, []);
-
-  useEffect(() => {
-    setCurrentStates();
-  }, [clients, channels, connections, activeConnectionId]);
+  const { clients, channels, connections, activeConnectionId, currentChannel } = useTSRemoteApp({
+    remoteAppPort: 5899,
+  });
 
   return (
     <div className="App">
diff --git a/src/hooks/useTSRemoteApp.tsx b/src/hooks/useTSRemoteApp.tsx
new file mode 100644
index 0000000..d80f0fe
--- /dev/null
+++ b/src/hooks/useTSRemoteApp.tsx
@@ -0,0 +1,56 @@
+import { TS5ConnectionHandler } from "@/handlers/teamspeak/connectionHandler";
+import { IClient, IChannel, IConnection, ITS5ConnectionHandler } from "@/interfaces/teamspeak";
+import { useEffect, useState } from "react";
+
+export default function useTSRemoteApp({ remoteAppPort = 5899 }: { remoteAppPort: number }) {
+  const [clients, setClients] = useState<IClient[]>([]);
+  const [channels, setChannels] = useState<IChannel[]>([]);
+  const [connections, setConnections] = useState<IConnection[]>([]);
+  const [activeConnectionId, setActiveConnectionId] = useState<number>(1);
+
+  const [currentConnection, setCurrentConnection] = useState<IConnection | undefined>(undefined);
+  const [currentChannel, setCurrentChannel] = useState<IChannel | undefined>(undefined);
+  const [currentClient, setCurrentClient] = useState<IClient | undefined>(undefined);
+
+  function setCurrentStates() {
+    const currentConnection = connections.find((connection) => connection.id === activeConnectionId);
+    setCurrentConnection(currentConnection);
+
+    if (currentConnection) {
+      const currentClient = clients.find((client) => client.id === currentConnection.clientId);
+      setCurrentClient(currentClient);
+      if (currentClient) {
+        const currentChannel = channels.find((channel) => channel.id === currentClient.channel?.id);
+        setCurrentChannel(currentChannel);
+        if (currentChannel) {
+          return currentChannel;
+        }
+      }
+    }
+  }
+
+  useEffect(() => {
+    const tsConnection: ITS5ConnectionHandler = new TS5ConnectionHandler(
+      remoteAppPort,
+      setConnections,
+      setChannels,
+      setClients,
+      setActiveConnectionId
+    );
+    tsConnection.connect();
+  }, []);
+
+  useEffect(() => {
+    setCurrentStates();
+  }, [clients, channels, connections, activeConnectionId]);
+
+  return {
+    clients,
+    channels,
+    connections,
+    activeConnectionId,
+    currentConnection,
+    currentChannel,
+    currentClient,
+  };
+}