diff --git a/internal/datasources/service/service.go b/internal/datasources/service/service.go
index c2116b19cf..d2329665e6 100644
--- a/internal/datasources/service/service.go
+++ b/internal/datasources/service/service.go
@@ -235,6 +235,8 @@ func (d *dataSourceService) Create(
 		return nil, fmt.Errorf("failed to commit transaction: %w", err)
 	}
 
+	ds.Id = dsRecord.ID.String()
+
 	return ds, nil
 }
 
diff --git a/internal/datasources/service/service_test.go b/internal/datasources/service/service_test.go
index e7d1fdf88e..935f08bee1 100644
--- a/internal/datasources/service/service_test.go
+++ b/internal/datasources/service/service_test.go
@@ -563,6 +563,7 @@ func TestCreate(t *testing.T) {
 
 			require.NoError(t, err)
 			assert.Equal(t, tt.want.Name, got.Name)
+			assert.NotEmpty(t, got.Id)
 		})
 	}
 }