diff --git a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
index 75406f48..539941f9 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
@@ -33,19 +33,10 @@ import { useState } from "react";
 import { SwitchInput } from "@app/components/SwitchInput";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
-import { Tag, TagInput } from "@app/components/tags/tag-input";
 
 const GeneralFormSchema = z.object({
     name: z.string().nonempty("Name is required"),
-    dockerSocketEnabled: z.boolean().optional(),
-    remoteSubnets: z
-        .array(
-            z.object({
-                id: z.string(),
-                text: z.string()
-            })
-        )
-        .optional()
+    dockerSocketEnabled: z.boolean().optional()
 });
 
 type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
@@ -68,13 +59,7 @@ export default function GeneralPage() {
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             name: site?.name,
-            dockerSocketEnabled: site?.dockerSocketEnabled ?? false,
-            remoteSubnets: site?.remoteSubnets
-                ? site.remoteSubnets.split(",").map((subnet, index) => ({
-                      id: subnet.trim(),
-                      text: subnet.trim()
-                  }))
-                : []
+            dockerSocketEnabled: site?.dockerSocketEnabled ?? false
         },
         mode: "onChange"
     });
@@ -85,11 +70,7 @@ export default function GeneralPage() {
         await api
             .post(`/site/${site?.siteId}`, {
                 name: data.name,
-                dockerSocketEnabled: data.dockerSocketEnabled,
-                remoteSubnets:
-                    data.remoteSubnets
-                        ?.map((subnet) => subnet.text)
-                        .join(",") || ""
+                dockerSocketEnabled: data.dockerSocketEnabled
             })
             .catch((e) => {
                 toast({
@@ -104,9 +85,7 @@ export default function GeneralPage() {
 
         updateSite({
             name: data.name,
-            dockerSocketEnabled: data.dockerSocketEnabled,
-            remoteSubnets:
-                data.remoteSubnets?.map((subnet) => subnet.text).join(",") || ""
+            dockerSocketEnabled: data.dockerSocketEnabled
         });
 
         toast({
@@ -153,65 +132,6 @@ export default function GeneralPage() {
                                     )}
                                 />
 
-                                {env.flags.enableClients &&
-                                site.type === "newt" ? (
-                                    <FormField
-                                        control={form.control}
-                                        name="remoteSubnets"
-                                        render={({ field }) => (
-                                            <FormItem>
-                                                <FormLabel>
-                                                    {t("remoteSubnets")}
-                                                </FormLabel>
-                                                <FormControl>
-                                                    <TagInput
-                                                        {...field}
-                                                        activeTagIndex={
-                                                            activeCidrTagIndex
-                                                        }
-                                                        setActiveTagIndex={
-                                                            setActiveCidrTagIndex
-                                                        }
-                                                        placeholder={t(
-                                                            "enterCidrRange"
-                                                        )}
-                                                        size="sm"
-                                                        tags={
-                                                            form.getValues()
-                                                                .remoteSubnets ||
-                                                            []
-                                                        }
-                                                        setTags={(
-                                                            newSubnets
-                                                        ) => {
-                                                            form.setValue(
-                                                                "remoteSubnets",
-                                                                newSubnets as Tag[]
-                                                            );
-                                                        }}
-                                                        validateTag={(tag) => {
-                                                            // Basic CIDR validation regex
-                                                            const cidrRegex =
-                                                                /^(\d{1,3}\.){3}\d{1,3}\/\d{1,2}$/;
-                                                            return cidrRegex.test(
-                                                                tag
-                                                            );
-                                                        }}
-                                                        allowDuplicates={false}
-                                                        sortTags={true}
-                                                    />
-                                                </FormControl>
-                                                <FormDescription>
-                                                    {t(
-                                                        "remoteSubnetsDescription"
-                                                    )}
-                                                </FormDescription>
-                                                <FormMessage />
-                                            </FormItem>
-                                        )}
-                                    />
-                                ) : null}
-
                                 {site && site.type === "newt" && (
                                     <FormField
                                         control={form.control}