diff --git a/src/components/sheets/edit-entity-group.tsx b/src/components/sheets/edit-entity-group.tsx
index 2430f90..ab314bf 100644
--- a/src/components/sheets/edit-entity-group.tsx
+++ b/src/components/sheets/edit-entity-group.tsx
@@ -161,8 +161,8 @@ export function EditEntityGroupSheet({ entityGroup }: EditEntityGroupProps) {
                                     return checked
                                       ? field.onChange([...field.value, o.value])
                                       : field.onChange(
-                                        field.value?.filter((value) => value !== o.value),
-                                      )
+                                          field.value?.filter((value) => value !== o.value),
+                                        )
                                   }}
                                 >
                                   {o.label}
diff --git a/src/components/sheets/new-entity-group.tsx b/src/components/sheets/new-entity-group.tsx
index ebabf93..98d9052 100644
--- a/src/components/sheets/new-entity-group.tsx
+++ b/src/components/sheets/new-entity-group.tsx
@@ -56,6 +56,7 @@ export function NewEntityGroupSheet() {
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
     defaultValues: {
+      name: '',
       components: [],
     },
   })
@@ -143,8 +144,8 @@ export function NewEntityGroupSheet() {
                                     return checked
                                       ? field.onChange([...field.value, o.value])
                                       : field.onChange(
-                                        field.value?.filter((value) => value !== o.value),
-                                      )
+                                          field.value?.filter((value) => value !== o.value),
+                                        )
                                   }}
                                 >
                                   {o.label}
diff --git a/src/components/sidebar/persona.tsx b/src/components/sidebar/persona.tsx
index e423c9a..858fb1e 100644
--- a/src/components/sidebar/persona.tsx
+++ b/src/components/sidebar/persona.tsx
@@ -39,6 +39,9 @@ export function CreatePersona() {
   const queryClient = useQueryClient()
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
+    defaultValues: {
+      personaTag: '',
+    },
   })
 
   const handleSubmit = async ({ personaTag }: z.infer<typeof formSchema>) => {
diff --git a/src/components/sidebar/queries.tsx b/src/components/sidebar/queries.tsx
index 0138f37..6cb846b 100644
--- a/src/components/sidebar/queries.tsx
+++ b/src/components/sidebar/queries.tsx
@@ -66,18 +66,23 @@ interface QueryProp {
 function Query({ query }: QueryProp) {
   const { cardinalUrl, isCardinalConnected } = useCardinal()
   const queryClient = useQueryClient()
+  // TODO: fix uncontrolled component error by adding default values here, tho we need to set the
+  // schema first to do this. same goes to the useForm in ./messages.tsx
   const form = useForm()
 
   // @ts-ignore
   const handleSubmit = (values) => {
-    queryClient.fetchQuery(
-      lastQueryQueryOptions({
-        cardinalUrl,
-        isCardinalConnected,
-        name: query.name,
-        body: values as object,
-      }),
-    ).then(() => true).catch((e) => console.log(e))
+    queryClient
+      .fetchQuery(
+        lastQueryQueryOptions({
+          cardinalUrl,
+          isCardinalConnected,
+          name: query.name,
+          body: values as object,
+        }),
+      )
+      .then(() => true)
+      .catch((e) => console.log(e))
   }
 
   return (
diff --git a/src/lib/cardinal-provider.tsx b/src/lib/cardinal-provider.tsx
index 6a50911..f76119e 100644
--- a/src/lib/cardinal-provider.tsx
+++ b/src/lib/cardinal-provider.tsx
@@ -14,7 +14,7 @@ interface CardinalProviderProps {
 // TODO: consider whether to put cardinal url/port in .env too
 const storageKey = 'cardinal-url'
 const defaultCardinalUrl = 'http://localhost:4040'
-const defaultCardinalNamespace = import.meta.env.CARDINAL_NAMESPACE as string || 'world-1'
+const defaultCardinalNamespace = (import.meta.env.CARDINAL_NAMESPACE as string) || 'world-1'
 const initialState: CardinalProviderState = {
   cardinalUrl: defaultCardinalUrl,
   setCardinalUrl: () => null,