diff --git a/features/shared-memory.yml b/features/shared-memory.yml
index 0617c88ca65..877084d9a9e 100644
--- a/features/shared-memory.yml
+++ b/features/shared-memory.yml
@@ -5,8 +5,11 @@ spec:
   - https://tc39.es/ecma262/multipage/structured-data.html#sec-sharedarraybuffer-objects
   - https://tc39.es/ecma262/multipage/structured-data.html#sec-atomics-object
 group: javascript
+status:
+  compute_from: javascript.builtins.SharedArrayBuffer
 compat_features:
   - javascript.builtins.Atomics
+  - javascript.builtins.Atomics.Atomic_operations_on_non_shared_buffers
   - javascript.builtins.Atomics.add
   - javascript.builtins.Atomics.and
   - javascript.builtins.Atomics.compareExchange
@@ -21,7 +24,7 @@ compat_features:
   - javascript.builtins.Atomics.xor
   - javascript.builtins.DataView.DataView.sharedarraybuffer_support
   - javascript.builtins.SharedArrayBuffer
+  - javascript.builtins.SharedArrayBuffer.@@species
   - javascript.builtins.SharedArrayBuffer.SharedArrayBuffer
   - javascript.builtins.SharedArrayBuffer.byteLength
   - javascript.builtins.SharedArrayBuffer.slice
-  - javascript.builtins.SharedArrayBuffer.@@species
diff --git a/features/shared-memory.yml.dist b/features/shared-memory.yml.dist
index 01939496f9b..e3c1a6bf6f3 100644
--- a/features/shared-memory.yml.dist
+++ b/features/shared-memory.yml.dist
@@ -57,3 +57,9 @@ compat_features:
   - javascript.builtins.SharedArrayBuffer.SharedArrayBuffer
   - javascript.builtins.SharedArrayBuffer.byteLength
   - javascript.builtins.SharedArrayBuffer.slice
+
+  # baseline: false
+  # support:
+  #   firefox: "79"
+  #   firefox_android: "79"
+  - javascript.builtins.Atomics.Atomic_operations_on_non_shared_buffers