diff --git a/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m b/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m
index cf97b6d..cab2c0d 100644
--- a/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m
+++ b/StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m
@@ -122,6 +122,8 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
 
 -(void) unregisterForEvents
 {
+    [super unregisterForEvents];
+    
     [self stopNotifier];
 }
 
diff --git a/StreamingKit/StreamingKit/STKCoreFoundationDataSource.m b/StreamingKit/StreamingKit/STKCoreFoundationDataSource.m
index 31e7598..2532181 100644
--- a/StreamingKit/StreamingKit/STKCoreFoundationDataSource.m
+++ b/StreamingKit/StreamingKit/STKCoreFoundationDataSource.m
@@ -86,7 +86,10 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
 {
     if (stream)
     {
-        [self unregisterForEvents];
+        if (eventsRunLoop)
+        {
+        	[self unregisterForEvents];
+        }
         
         [self close];