diff --git a/Hive/Controllers/HICameraWindowController.h b/Hive/Controllers/HICameraWindowController.h
index 29dc82c7..744a927b 100644
--- a/Hive/Controllers/HICameraWindowController.h
+++ b/Hive/Controllers/HICameraWindowController.h
@@ -12,7 +12,7 @@
  */
 @interface HICameraWindowController : NSWindowController
 
-@property (nonatomic, strong) id<HICameraWindowControllerDelegate> delegate;
+@property (nonatomic, weak) id<HICameraWindowControllerDelegate> delegate;
 
 + (HICameraWindowController *)sharedCameraWindowController;
 
diff --git a/Hive/Controllers/HIContactAutocompleteWindowController.h b/Hive/Controllers/HIContactAutocompleteWindowController.h
index 76c3dd42..a72e46c0 100644
--- a/Hive/Controllers/HIContactAutocompleteWindowController.h
+++ b/Hive/Controllers/HIContactAutocompleteWindowController.h
@@ -21,7 +21,7 @@
 
 @interface HIContactAutocompleteWindowController : NSWindowController <NSTableViewDelegate>
 
-@property (nonatomic, unsafe_unretained) id<HIContactAutocompleteDelegate> delegate;
+@property (nonatomic, weak) id<HIContactAutocompleteDelegate> delegate;
 
 - (void)searchWithContact:(HIContact *)contact;
 - (void)searchWithQuery:(NSString *)query;
diff --git a/Hive/Controllers/HIContactTabBarController.m b/Hive/Controllers/HIContactTabBarController.m
index 774c4658..ee35f94c 100644
--- a/Hive/Controllers/HIContactTabBarController.m
+++ b/Hive/Controllers/HIContactTabBarController.m
@@ -15,7 +15,7 @@ @interface HIContactTabBarController () {
     NSArray *_tabBarButtons;
 }
 
-@property (nonatomic, strong) IBOutlet id<HIProfileTabBarControllerDelegate> tabDelegate;
+@property (nonatomic, weak) IBOutlet id<HIProfileTabBarControllerDelegate> tabDelegate;
 
 @end
 
diff --git a/Hive/Controllers/HISidebarController.m b/Hive/Controllers/HISidebarController.m
index ba57bd26..8c748b96 100644
--- a/Hive/Controllers/HISidebarController.m
+++ b/Hive/Controllers/HISidebarController.m
@@ -32,7 +32,7 @@ @interface HISidebarController () {
 
 @property (nonatomic, weak) IBOutlet NSView *view;
 @property (nonatomic, weak) IBOutlet NSButton *sendButton;
-@property (nonatomic, unsafe_unretained) IBOutlet id<HISidebarControllerDelegate> delegate;
+@property (nonatomic, weak) IBOutlet id<HISidebarControllerDelegate> delegate;
 
 @property (nonatomic, assign) NSInteger selectedTabIndex;
 
diff --git a/Hive/Controllers/HITransactionPopoverViewController.h b/Hive/Controllers/HITransactionPopoverViewController.h
index 2df1265b..1f1954d3 100644
--- a/Hive/Controllers/HITransactionPopoverViewController.h
+++ b/Hive/Controllers/HITransactionPopoverViewController.h
@@ -17,7 +17,7 @@
 
 @interface HITransactionPopoverViewController : NSViewController
 
-@property (nonatomic, strong) id<HITransactionPopoverDelegate> delegate;
+@property (nonatomic, weak) id<HITransactionPopoverDelegate> delegate;
 
 - (instancetype)initWithTransaction:(HITransaction *)transaction;
 - (NSPopover *)createPopover;
diff --git a/Hive/Controllers/HIWizardViewController.h b/Hive/Controllers/HIWizardViewController.h
index 1bc6ff19..4fc35bfd 100644
--- a/Hive/Controllers/HIWizardViewController.h
+++ b/Hive/Controllers/HIWizardViewController.h
@@ -14,7 +14,7 @@
 
 @interface HIWizardViewController : NSViewController
 
-@property (nonatomic, strong) id<HIWizardViewControllerDelegate> wizardDelegate;
+@property (nonatomic, weak) id<HIWizardViewControllerDelegate> wizardDelegate;
 @property (nonatomic, strong, readonly) NSResponder *initialFirstResponder;
 
 - (void)viewWillAppear;
diff --git a/Hive/Views/HITitleView.h b/Hive/Views/HITitleView.h
index 3915b5f0..d7ef6deb 100644
--- a/Hive/Views/HITitleView.h
+++ b/Hive/Views/HITitleView.h
@@ -27,7 +27,7 @@
 
 @interface HITitleView : NSView
 
-@property (nonatomic, unsafe_unretained) id<HITitleViewDelegate> delegate;
+@property (nonatomic, weak) id<HITitleViewDelegate> delegate;
 
 - (void)pushTitle:(NSString *)title;
 - (void)popToTitleAtPosition:(NSInteger)position;