diff --git a/superset-frontend/src/components/Datasource/DatasourceModal.tsx b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
index b5b698f8315b..5e985ca374b4 100644
--- a/superset-frontend/src/components/Datasource/DatasourceModal.tsx
+++ b/superset-frontend/src/components/Datasource/DatasourceModal.tsx
@@ -139,7 +139,7 @@ const DatasourceModal: FunctionComponent<DatasourceModalProps> = ({
         ),
         columns: currentDatasource?.columns?.map(
           (column: Record<string, unknown>) => ({
-            id: column.id,
+            id: typeof column.id === 'number' ? column.id : undefined,
             column_name: column.column_name,
             type: column.type,
             advanced_data_type: column.advanced_data_type,
diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index eaf5963fdf32..41759c2e84ab 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -45,7 +45,7 @@ def validate_python_date_format(value: str) -> None:
 
 
 class DatasetColumnsPutSchema(Schema):
-    id = fields.Integer()
+    id = fields.Integer(required=False)
     column_name = fields.String(required=True, validate=Length(1, 255))
     type = fields.String(allow_none=True)
     advanced_data_type = fields.String(allow_none=True, validate=Length(1, 255))