diff --git a/src/js/components/Fields/OutputControl.js b/src/js/components/Fields/OutputControl.js
index 454774de..d6484561 100755
--- a/src/js/components/Fields/OutputControl.js
+++ b/src/js/components/Fields/OutputControl.js
@@ -91,9 +91,13 @@ const Group = ({
 }) => {
   const allClients = useSelector((state) => state.snapcast.clients || {});
   const allStreams = indexToArray(useSelector((state) => state.snapcast.streams || {}));
-  const clients = clients_ids.length > 0 ? clients_ids.map((c) => allClients[c]) : [];
+  const clients = clients_ids.length > 0
+    ? clients_ids.map((c) => allClients[c]).filter((c) => c.connected)
+    : [];
   const dispatch = useDispatch();
 
+  if (!clients || !clients.length) return null;
+
   return (
     <div className="output-control__group">
       <h5 className="output-control__group__title">