diff --git a/src/__tests__/fixtures/concurrent-index-2/1_create-table.sql b/src/__tests__/fixtures/concurrent-index-2/1_create-table.sql
new file mode 100644
index 0000000..3642a5c
--- /dev/null
+++ b/src/__tests__/fixtures/concurrent-index-2/1_create-table.sql
@@ -0,0 +1,3 @@
+CREATE TABLE IF NOT EXISTS concurrent (
+  id integer
+);
diff --git a/src/__tests__/fixtures/concurrent-index-2/2_insert-million-rows.sql b/src/__tests__/fixtures/concurrent-index-2/2_insert-million-rows.sql
new file mode 100644
index 0000000..0087b1f
--- /dev/null
+++ b/src/__tests__/fixtures/concurrent-index-2/2_insert-million-rows.sql
@@ -0,0 +1,7 @@
+-- will acquire ROW EXCLUSIVE table-level locks for the rest of the (reasonably long-running) transaction
+INSERT INTO concurrent (id) SELECT i FROM generate_series(1, 1000000) as t(i);
+
+-- will attempt to acquire ACCESS EXCLUSIVE table-level lock
+-- will deadlock if this same transaction is running concurrently:
+-- - both transactions will be waiting for the other to release the conflicting ROW EXCLUSIVE locks
+ALTER TABLE concurrent ADD PRIMARY KEY (id);
diff --git a/src/__tests__/fixtures/concurrent-index-2/3_index-concurrently.sql b/src/__tests__/fixtures/concurrent-index-2/3_index-concurrently.sql
new file mode 100644
index 0000000..d0523ca
--- /dev/null
+++ b/src/__tests__/fixtures/concurrent-index-2/3_index-concurrently.sql
@@ -0,0 +1,3 @@
+-- postgres-migrations disable-transaction
+
+CREATE INDEX CONCURRENTLY concurrent_index ON concurrent (id);
diff --git a/src/__tests__/migrate.ts b/src/__tests__/migrate.ts
index d9d208b..e7fb575 100644
--- a/src/__tests__/migrate.ts
+++ b/src/__tests__/migrate.ts
@@ -45,6 +45,36 @@ test("concurrent migrations", async t => {
   t.truthy(exists)
 })
 
+// https://github.com/ThomWright/postgres-migrations/issues/36
+test("concurrent migrations - index concurrently", async t => {
+  const databaseName = "migration-test-concurrent-no-tx"
+  const dbConfig = {
+    database: databaseName,
+    user: "postgres",
+    password: PASSWORD,
+    host: "localhost",
+    port,
+  }
+
+  await createDb(databaseName, dbConfig)
+
+  await migrate(dbConfig, "src/__tests__/fixtures/concurrent")
+
+  // will deadlock if one process has the advisory lock and tries to index concurrently
+  // while the other waits for the advisory lock
+  await Promise.all([
+    migrate(dbConfig, "src/__tests__/fixtures/concurrent-index-2", {
+      logger: msg => console.log("A", msg),
+    }),
+    migrate(dbConfig, "src/__tests__/fixtures/concurrent-index-2", {
+      logger: msg => console.log("B", msg),
+    }),
+  ])
+
+  const exists = await doesTableExist(dbConfig, "concurrent")
+  t.truthy(exists)
+})
+
 // can't test with unconnected client because `pg` just hangs on the first query...
 test("with connected client", async t => {
   const databaseName = "migration-test-with-connected-client"
diff --git a/src/with-lock.ts b/src/with-lock.ts
index 4e519d2..135e782 100644
--- a/src/with-lock.ts
+++ b/src/with-lock.ts
@@ -8,7 +8,17 @@ export function withAdvisoryLock<T>(
     try {
       try {
         log("Acquiring advisory lock...")
-        await client.query("SELECT pg_advisory_lock(-8525285245963000605);")
+        let acquired = false
+        while (!acquired) {
+          const lockResult = await client.query(
+            "SELECT pg_try_advisory_lock(-8525285245963000605);",
+          )
+          if (lockResult.rows[0].pg_try_advisory_lock === true) {
+            acquired = true
+          } else {
+            await new Promise(res => setTimeout(res, 1000))
+          }
+        }
         log("... aquired advisory lock")
       } catch (e) {
         log(`Error acquiring advisory lock: ${e.message}`)