diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
index c560ceb6525f..0583cbf94c24 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -140,10 +140,11 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
 	[bti setDelegate: sbt];
 	[bti setInquiryLength: 2];
 
-	if ([bti start] == kIOReturnSuccess)
-		[bti retain];
-	else
+	if ([bti start] != kIOReturnSuccess)
+	{
 		ERROR_LOG(WIIMOTE, "Unable to do bluetooth discovery");
+		return;
+	}
 
 	do
 	{
@@ -164,7 +165,7 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
 			continue;
 
 		Wiimote *wm = new Wiimote();
-		wm->btd = dev;
+		wm->btd = [dev retain];
 		
 		if(IsBalanceBoardName([[dev name] UTF8String]))
 		{
@@ -195,17 +196,27 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
 
 	ConnectBT *cbt = [[ConnectBT alloc] init];
 
+	cchan = ichan = nil;
+
 	[btd openL2CAPChannelSync: &cchan
 		withPSM: kBluetoothL2CAPPSMHIDControl delegate: cbt];
 	[btd openL2CAPChannelSync: &ichan
 		withPSM: kBluetoothL2CAPPSMHIDInterrupt delegate: cbt];
-	if (ichan == NULL || cchan == NULL)
+	// Apple docs claim:
+	// "The L2CAP channel object is already retained when this function returns
+	// success; the channel must be released when the caller is done with it."
+	// But without this, the channels get over-autoreleased, even though the
+	// refcounting behavior here is clearly correct.
+	[ichan retain];
+	[cchan retain];
+	if (ichan == nil || cchan == nil)
 	{
 		ERROR_LOG(WIIMOTE, "Unable to open L2CAP channels "
 			"for wiimote %i", index + 1);
 		DisconnectInternal();
-		
 		[cbt release];
+		[ichan release];
+		[cchan release];
 		return false;
 	}
 
@@ -221,18 +232,17 @@ - (void) l2capChannelClosed: (IOBluetoothL2CAPChannel *) l2capChannel
 // Disconnect a wiimote.
 void Wiimote::DisconnectInternal()
 {
-	if (ichan != NULL)
-		[ichan release];
-
-	if (cchan != NULL)
-		[cchan release];
+	[ichan closeChannel];
+	[ichan release];
+	ichan = NULL;
 
-	if (btd != NULL)
-		[btd closeConnection];
+	[cchan closeChannel];
+	[cchan release];
+	cchan = NULL;
 
+	[btd closeConnection];
+	[btd release];
 	btd = NULL;
-	cchan = NULL;
-	ichan = NULL;
 
 	if (!IsConnected())
 		return;