diff --git a/Tusker/Screens/Conversation/ConversationTableViewController.swift b/Tusker/Screens/Conversation/ConversationTableViewController.swift
index 00ad1046..85ab426f 100644
--- a/Tusker/Screens/Conversation/ConversationTableViewController.swift
+++ b/Tusker/Screens/Conversation/ConversationTableViewController.swift
@@ -15,7 +15,7 @@ class ConversationTableViewController: EnhancedTableViewController {
     static let showPostsImage = UIImage(systemName: "eye.fill")!
     static let hidePostsImage = UIImage(systemName: "eye.slash.fill")!
     
-    let mastodonController: MastodonController
+    weak var mastodonController: MastodonController!
     
     let mainStatusID: String
     let mainStatusState: StatusState
diff --git a/Tusker/Screens/Explore/ExploreViewController.swift b/Tusker/Screens/Explore/ExploreViewController.swift
index bc023de5..e8fde0c4 100644
--- a/Tusker/Screens/Explore/ExploreViewController.swift
+++ b/Tusker/Screens/Explore/ExploreViewController.swift
@@ -12,7 +12,7 @@ import Pachyderm
 
 class ExploreViewController: EnhancedTableViewController {
 
-    let mastodonController: MastodonController
+    weak var mastodonController: MastodonController!
     
     var dataSource: DataSource!
     
diff --git a/Tusker/Screens/Notifications/NotificationsTableViewController.swift b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
index 70142897..a9b5d98f 100644
--- a/Tusker/Screens/Notifications/NotificationsTableViewController.swift
+++ b/Tusker/Screens/Notifications/NotificationsTableViewController.swift
@@ -17,7 +17,7 @@ class NotificationsTableViewController: EnhancedTableViewController {
     private let followRequestCell = "followRequestCell"
     private let unknownCell = "unknownCell"
     
-    let mastodonController: MastodonController
+    weak var mastodonController: MastodonController!
     
     let excludedTypes: [Pachyderm.Notification.Kind]
     let groupTypes = [Notification.Kind.favourite, .reblog, .follow]
diff --git a/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift b/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift
index 0145b887..b7595a92 100644
--- a/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift	
+++ b/Tusker/Screens/Status Action Account List/StatusActionAccountListTableViewController.swift	
@@ -14,7 +14,7 @@ class StatusActionAccountListTableViewController: EnhancedTableViewController {
     private let statusCell = "statusCell"
     private let accountCell = "accountCell"
     
-    let mastodonController: MastodonController
+    weak var mastodonController: MastodonController!
     
     let actionType: ActionType
     let statusID: String