diff --git a/sao/src/screen.js b/sao/src/screen.js
index 973c719f53..8183090e44 100644
--- a/sao/src/screen.js
+++ b/sao/src/screen.js
@@ -1356,6 +1356,9 @@
             });
         },
         get current_record() {
+            if (this.__current_record && this.__current_record.destroyed) {
+                this.__current_record = null;
+            }
             return this.__current_record;
         },
         set current_record(record) {