diff --git a/studio/data/fdw/fdw-create-mutation.ts b/studio/data/fdw/fdw-create-mutation.ts
index 590ec98f744..3243178d1f3 100644
--- a/studio/data/fdw/fdw-create-mutation.ts
+++ b/studio/data/fdw/fdw-create-mutation.ts
@@ -101,11 +101,13 @@ export function getCreateFDWSql({
         options (
           ${Object.entries(newTable)
             .filter(
-              ([key]) =>
+              ([key, value]) =>
                 key !== 'table_name' &&
                 key !== 'schema_name' &&
                 key !== 'columns' &&
-                key !== 'index'
+                key !== 'index' &&
+                key !== 'is_new_schema' &&
+                Boolean(value)
             )
             .map(([key, value]) => `${key} '${value}'`)
             .join(',\n          ')}