diff --git a/frontend/src/components/build/tabs/config/ExtraArgs.tsx b/frontend/src/components/build/tabs/config/ExtraArgs.tsx
index 3318833de..59e2464c3 100644
--- a/frontend/src/components/build/tabs/config/ExtraArgs.tsx
+++ b/frontend/src/components/build/tabs/config/ExtraArgs.tsx
@@ -28,7 +28,7 @@ const ExtraArgs: Component<{}> = (p) => {
           </button>
         </Show>
       </Flex>
-      <For each={[...build.docker_build_args!.extra_args!.keys()]}>
+      <For each={[...(build.docker_build_args?.extra_args?.keys() || [])]}>
         {(_, index) => (
           <Flex
             justifyContent={userCanUpdate() ? "space-between" : undefined}
@@ -37,7 +37,7 @@ const ExtraArgs: Component<{}> = (p) => {
           >
             <Input
               placeholder="--extra-arg=value"
-              value={build.docker_build_args!.extra_args![index()]}
+              value={build.docker_build_args?.extra_args?.[index()] || ""}
               style={{ width: "80%" }}
               onEdit={(value) =>
                 setBuild("docker_build_args", "extra_args", index(), value)