diff --git a/openpype/modules/settings_action.py b/openpype/modules/settings_action.py
index 2b4b51e3ad..1e7eca4dec 100644
--- a/openpype/modules/settings_action.py
+++ b/openpype/modules/settings_action.py
@@ -23,6 +23,11 @@ class SettingsAction(OpenPypeModule, ITrayAction):
         """Initialization in tray implementation of ITrayAction."""
         self.create_settings_window()
 
+    def tray_exit(self):
+        # Close settings UI to remove settings lock
+        if self.settings_window:
+            self.settings_window.close()
+
     def on_action_trigger(self):
         """Implementation for action trigger of ITrayAction."""
         self.show_settings_window()
diff --git a/openpype/tools/settings/settings/dialogs.py b/openpype/tools/settings/settings/dialogs.py
index f25374a48c..b1b4daa1a0 100644
--- a/openpype/tools/settings/settings/dialogs.py
+++ b/openpype/tools/settings/settings/dialogs.py
@@ -39,7 +39,7 @@ class BaseInfoDialog(QtWidgets.QDialog):
         ):
             other_information_layout.addRow(
                 label,
-                QtWidgets.QLabel(value, other_information)
+                QtWidgets.QLabel(value or "N/A", other_information)
             )
 
         timestamp_label = QtWidgets.QLabel(