diff --git a/src/widgets/slskd/component.jsx b/src/widgets/slskd/component.jsx
index f2a16fdf6..8c26d4e48 100644
--- a/src/widgets/slskd/component.jsx
+++ b/src/widgets/slskd/component.jsx
@@ -4,7 +4,7 @@ import Block from "components/services/widget/block";
 
 import useWidgetAPI from "utils/proxy/use-widget-api";
 
-export const slskdDefaultFields = ["slskStatus", "downloads", "uploads", "sharedFiles"];
+const slskdDefaultFields = ["slskStatus", "downloads", "uploads", "sharedFiles"];
 const MAX_ALLOWED_FIELDS = 4;
 
 export default function Component({ service }) {
@@ -16,7 +16,7 @@ export default function Component({ service }) {
   const { data: upData, error: upError } = useWidgetAPI(widget, "uploads");
 
   if (appError || downError || upError) {
-    return <Container service={service} error={appError || downError || upError} />;
+    return <Container service={service} error={appError ?? downError ?? upError} />;
   }
 
   if (!widget.fields || widget.fields.length === 0) {
@@ -37,18 +37,19 @@ export default function Component({ service }) {
     );
   }
 
-  const slskStatus = appData.serverStatus ? t("slskd.connected") : t("slskd.disconnected");
-  const updateStatus = appData.updateStatus ? t("slskd.update_yes") : t("slskd.update_no");
-  const downloads = downData?.length !== undefined ? downData?.length : 0;
-  const uploads = upData?.length !== undefined ? upData?.length : 0;
-
   return (
     <Container service={service}>
-      <Block label="slskd.slskStatus" value={slskStatus} />
-      <Block label="slskd.updateStatus" value={updateStatus} />
-      <Block label="slskd.downloads" value={t("common.number", { value: downloads })} />
-      <Block label="slskd.uploads" value={t("common.number", { value: uploads })} />
-      <Block label="slskd.sharedFiles" value={t("common.number", { value: appData.filesShared })} />
+      <Block
+        label="slskd.slskStatus"
+        value={appData.server?.isConnected ? t("slskd.connected") : t("slskd.disconnected")}
+      />
+      <Block
+        label="slskd.updateStatus"
+        value={appData.version?.isUpdateAvailable ? t("slskd.update_yes") : t("slskd.update_no")}
+      />
+      <Block label="slskd.downloads" value={t("common.number", { value: downData.length ?? 0 })} />
+      <Block label="slskd.uploads" value={t("common.number", { value: upData.length ?? 0 })} />
+      <Block label="slskd.sharedFiles" value={t("common.number", { value: appData.shares?.files ?? 0 })} />
     </Container>
   );
 }
diff --git a/src/widgets/slskd/widget.js b/src/widgets/slskd/widget.js
index 6508fe187..fdea77387 100644
--- a/src/widgets/slskd/widget.js
+++ b/src/widgets/slskd/widget.js
@@ -8,14 +8,6 @@ const widget = {
   mappings: {
     application: {
       endpoint: "application",
-      map: (data) => {
-        const jsonData = asJson(data);
-        return {
-          serverStatus: jsonData?.server?.isConnected,
-          updateAvailable: jsonData?.version?.isUpdateAvailable,
-          filesShared: jsonData?.shares.files,
-        };
-      },
     },
     downloads: {
       endpoint: "transfers/downloads",