diff --git a/gui/kivy/__init__.py b/gui/kivy/__init__.py
index e02bd0666..2acfad7f3 100644
--- a/gui/kivy/__init__.py
+++ b/gui/kivy/__init__.py
@@ -56,4 +56,5 @@ class ElectrumGui:
                            plugins = self.plugins,
                            gui_object=self)
         w.run()
-        self.config.save_last_wallet(w.wallet)
+        if w.wallet:
+            self.config.save_last_wallet(w.wallet)