diff --git a/dashboard/src/main/home/database-dashboard/forms/SandboxDatastoreForm.tsx b/dashboard/src/main/home/database-dashboard/forms/SandboxDatastoreForm.tsx
index 36ae1b1dd3..b802fc9790 100644
--- a/dashboard/src/main/home/database-dashboard/forms/SandboxDatastoreForm.tsx
+++ b/dashboard/src/main/home/database-dashboard/forms/SandboxDatastoreForm.tsx
@@ -161,14 +161,23 @@ const SandboxDatastoreForm: React.FC = () => {
                         return;
                       }
                       setTemplate(templateMatch);
-                      match(templateMatch).with(
-                        {
-                          name: DATASTORE_TEMPLATE_NEON.name,
-                        },
-                        () => {
-                          setValue("config.type", "neon");
-                        }
-                      );
+                      match(templateMatch)
+                        .with(
+                          {
+                            name: DATASTORE_TEMPLATE_NEON.name,
+                          },
+                          () => {
+                            setValue("config.type", "neon");
+                          }
+                        )
+                        .with(
+                          {
+                            name: DATASTORE_TEMPLATE_UPSTASH.name,
+                          },
+                          () => {
+                            setValue("config.type", "upstash");
+                          }
+                        );
                       setCurrentStep(4);
                     }}
                   />