diff --git a/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx
index 0634a69..8a8f8df 100644
--- a/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx
+++ b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx
@@ -47,25 +47,27 @@ export const QbittorrentConnectionForm = (): ReactElement => {
       }),
   });
 
-  return (
-    <>
-      {!isLoading ? (
-        <>
-          <ConnectionForm
-            initialData={hostDetails}
-            formHeading={"qBittorrent Configuration"}
-            submitHandler={mutate}
-          />
+  if (isError)
+    return (
+      <>
+        <pre>Something went wrong connecting to qBittorrent.</pre>
+      </>
+    );
+  if (!isLoading) {
+    return (
+      <>
+        <ConnectionForm
+          initialData={hostDetails}
+          formHeading={"qBittorrent Configuration"}
+          submitHandler={mutate}
+        />
 
-          <pre className="mt-5">
-            {JSON.stringify(qbittorrentClientInfo?.data, null, 4)}
-          </pre>
-        </>
-      ) : (
-        "Loading..."
-      )}
-    </>
-  );
+        <pre className="mt-5">
+          {JSON.stringify(qbittorrentClientInfo?.data, null, 4)}
+        </pre>
+      </>
+    );
+  }
 };
 
 export default QbittorrentConnectionForm;
diff --git a/src/client/components/shared/ConnectionForm/ConnectionForm.tsx b/src/client/components/shared/ConnectionForm/ConnectionForm.tsx
index 5de58bc..a6b2ccd 100644
--- a/src/client/components/shared/ConnectionForm/ConnectionForm.tsx
+++ b/src/client/components/shared/ConnectionForm/ConnectionForm.tsx
@@ -93,6 +93,12 @@ export const ConnectionForm = ({
                   {!isEmpty(initialData) ? "Update" : "Save"}
                 </button>
               </p>
+
+              <p className="control">
+                <button type="submit" className="button is-danger">
+                  {!isEmpty(initialData) && "Delete"}
+                </button>
+              </p>
             </div>
           </form>
         )}