diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js
index 883297d2b..58b9e9cd1 100644
--- a/packages/api/src/controllers/sessions.js
+++ b/packages/api/src/controllers/sessions.js
@@ -149,7 +149,7 @@ module.exports = {
     const { sesid } = await this.create({ conid, database });
     const session = this.opened.find(x => x.sesid == sesid);
     session.killOnDone = true;
-    const jslid = uuidv1();
+    const jslid = crypto.randomUUID();
     session.loadingReader_jslid = jslid;
     const fileName = queryName && appFolder ? path.join(appdir(), appFolder, `${queryName}.query.sql`) : null;
 
@@ -169,7 +169,7 @@ module.exports = {
 
   startProfiler_meta: true,
   async startProfiler({ sesid }) {
-    const jslid = uuidv1();
+    const jslid = crypto.randomUUID();
     const session = this.opened.find(x => x.sesid == sesid);
     if (!session) {
       throw new Error('Invalid session');
diff --git a/packages/api/src/utility/JsonLinesDatastore.js b/packages/api/src/utility/JsonLinesDatastore.js
index 99c12cbff..36190f57d 100644
--- a/packages/api/src/utility/JsonLinesDatastore.js
+++ b/packages/api/src/utility/JsonLinesDatastore.js
@@ -210,7 +210,7 @@ class JsonLinesDatastore {
   async getRows(offset, limit, filter, sort) {
     const res = [];
     if (sort && !this.sortedFiles[stableStringify(sort)]) {
-      const jslid = uuidv1();
+      const jslid = crypto.randomUUID();
       const sortedFile = path.join(jsldir(), `${jslid}.jsonl`);
       await JsonLinesDatastore.sortFile(this.file, sortedFile, sort);
       this.sortedFiles[stableStringify(sort)] = sortedFile;