diff --git a/packages/app-store/sendgrid/api/_postAdd.ts b/packages/app-store/sendgrid/api/_postAdd.ts
index 1cf672fb95..b34826d5d9 100644
--- a/packages/app-store/sendgrid/api/_postAdd.ts
+++ b/packages/app-store/sendgrid/api/_postAdd.ts
@@ -15,7 +15,13 @@ export async function getHandler(req: NextApiRequest) {
   const { api_key } = req.body;
   if (!api_key) throw new HttpError({ statusCode: 400, message: "No Api Key provided to check" });
 
-  const encrypted = symmetricEncrypt(JSON.stringify({ api_key }), process.env.CALENDSO_ENCRYPTION_KEY || "");
+  let encrypted;
+  try {
+    encrypted = symmetricEncrypt(JSON.stringify({ api_key }), process.env.CALENDSO_ENCRYPTION_KEY || "");
+  } catch (reason) {
+    logger.error("Could not add Sendgrid app", reason);
+    throw new HttpError({ statusCode: 500, message: "Invalid length - CALENDSO_ENCRYPTION_KEY" });
+  }
 
   const data = {
     type: "sendgrid_other_calendar",
diff --git a/packages/app-store/sendgrid/pages/setup/index.tsx b/packages/app-store/sendgrid/pages/setup/index.tsx
index bd59a3aa7b..0575763810 100644
--- a/packages/app-store/sendgrid/pages/setup/index.tsx
+++ b/packages/app-store/sendgrid/pages/setup/index.tsx
@@ -84,7 +84,7 @@ export default function SendgridSetup() {
                         onBlur={onBlur}
                         disabled={testPassed === true}
                         name="api_key"
-                        placeholder="api_xyz..."
+                        placeholder="SG.xxxxxx..."
                         onChange={async (e) => {
                           onChange(e.target.value);
                           form.setValue("api_key", e.target.value);