diff --git a/src/app/wallet/view.nim b/src/app/wallet/view.nim
index 4e72c96f1b..69fb020221 100644
--- a/src/app/wallet/view.nim
+++ b/src/app/wallet/view.nim
@@ -23,8 +23,14 @@ QtObject:
 
   proc delete(self: WalletView) =
     self.accountsView.delete
+    self.collectiblesView.delete
+    self.transactionsView.delete
+    self.tokensView.delete
+    self.dappBrowserView.delete
     self.gasView.delete
     self.ensView.delete
+    self.historyView.delete
+    self.balanceView.delete
     self.utilsView.delete
     self.QAbstractListModel.delete
 
diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 724d95ed0e..e8097a9f46 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -45,10 +45,6 @@ proc mainProc() =
   status.tasks.marathon.registerWorker(mailserverWorker)
   status.initNode()
 
-  defer: 
-    info "Status app is shutting down..."
-    status.tasks.teardown()
-
   enableHDPI()
   initializeOpenGL()
 
@@ -185,6 +181,11 @@ proc mainProc() =
     node.init()
     wallet.checkPendingTransactions()
 
+  # this should be the last defer in the scope
+  defer:
+    info "Status app is shutting down..."
+    status.tasks.teardown()
+
   engine.setRootContextProperty("loginModel", login.variant)
   engine.setRootContextProperty("onboardingModel", onboarding.variant)