diff --git a/src/domain/session/rightpanel/disambiguator.js b/src/domain/session/rightpanel/disambiguator.js
index 153fc6c1..44acc733 100644
--- a/src/domain/session/rightpanel/disambiguator.js
+++ b/src/domain/session/rightpanel/disambiguator.js
@@ -143,5 +143,15 @@ export function tests(){
             d.disambiguate(vm1);
             assert.strictEqual(vm1.disambiguate, false);
         },
+
+        "Empty names must un-disambiguate": assert => {
+            const [vm1, vm2, d] = createVmAndDisambiguator([["", "a"], ["", "b"]]);
+            d.disambiguate(vm1);
+            d.disambiguate(vm2);
+            vm1.updateName("foo");
+            d.disambiguate(vm1);
+            assert.strictEqual(vm1.disambiguate, false);
+            assert.strictEqual(vm2.disambiguate, false);
+        }
     };
 }