diff --git a/.replit b/.replit
index 2934391..aa839ef 100644
--- a/.replit
+++ b/.replit
@@ -19,10 +19,6 @@ externalPort = 80
 localPort = 33035
 externalPort = 3001
 
-[[ports]]
-localPort = 37459
-externalPort = 5173
-
 [[ports]]
 localPort = 41295
 externalPort = 6000
diff --git a/client/src/pages/sites.tsx b/client/src/pages/sites.tsx
index 7e9d102..de7d018 100644
--- a/client/src/pages/sites.tsx
+++ b/client/src/pages/sites.tsx
@@ -50,6 +50,7 @@ export default function Sites() {
       name: "",
       address: "",
       customerId: undefined,
+      location: "roccapiemonte",
       shiftType: "fixed_post",
       minGuards: 1,
       requiresArmed: false,
@@ -69,6 +70,7 @@ export default function Sites() {
       name: "",
       address: "",
       customerId: undefined,
+      location: "roccapiemonte",
       shiftType: "fixed_post",
       minGuards: 1,
       requiresArmed: false,
@@ -347,7 +349,7 @@ export default function Sites() {
                   render={({ field }) => (
                     <FormItem>
                       <FormLabel>Tipologia Servizio</FormLabel>
-                      <Select onValueChange={field.onChange} defaultValue={field.value}>
+                      <Select onValueChange={field.onChange} value={field.value ?? undefined}>
                         <FormControl>
                           <SelectTrigger data-testid="select-shift-type">
                             <SelectValue placeholder="Seleziona tipo servizio" />
@@ -633,7 +635,7 @@ export default function Sites() {
                 render={({ field }) => (
                   <FormItem>
                     <FormLabel>Tipologia Servizio</FormLabel>
-                    <Select onValueChange={field.onChange} defaultValue={field.value}>
+                    <Select onValueChange={field.onChange} value={field.value ?? undefined}>
                       <FormControl>
                         <SelectTrigger data-testid="select-edit-shift-type">
                           <SelectValue placeholder="Seleziona tipo servizio" />