diff --git a/GetHip/Main.storyboard b/GetHip/Main.storyboard
index 3112a64..01084a8 100644
--- a/GetHip/Main.storyboard
+++ b/GetHip/Main.storyboard
@@ -1457,6 +1457,6 @@
         <image name="Turntable@3x.png" width="434" height="434"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="4Cw-Wg-nXy"/>
+        <segue reference="dYP-IJ-p2K"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/GetHip/PartyServiceManager.swift b/GetHip/PartyServiceManager.swift
index fd15dd6..84ebef6 100644
--- a/GetHip/PartyServiceManager.swift
+++ b/GetHip/PartyServiceManager.swift
@@ -121,8 +121,9 @@ class PartyServiceManager: NSObject {
     func stopAllServices(){
         stopBrowsing()
         stopListening()
-        self.serviceBrowser.delegate = self
-        self.serviceAdvertiser.delegate = self
+        self.serviceBrowser.delegate = nil
+        self.serviceAdvertiser.delegate = nil
+        self.session.delegate = nil
         self.serviceBrowser = nil
         self.serviceAdvertiser = nil
         self.session = nil
diff --git a/GetHip/SettingsTableViewController.swift b/GetHip/SettingsTableViewController.swift
index 72be558..d838491 100644
--- a/GetHip/SettingsTableViewController.swift
+++ b/GetHip/SettingsTableViewController.swift
@@ -19,6 +19,7 @@ class SettingsTableViewController: UIViewController, UITableViewDataSource, UITa
     @IBAction func dismissSettingsView(sender: UIBarButtonItem) {
         
         self.dismissViewControllerAnimated(true, completion: nil)
+        self.party = nil
     }