diff --git a/macosx/Controller.m b/macosx/Controller.m
index da1a0299a..e5d15242f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1115,6 +1115,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         if (!lowestOrderValue || [lowestOrderValue compare: currentOrderValue] == NSOrderedDescending)
             lowestOrderValue = currentOrderValue;
         
+        [torrent removeTorrent];
         [fTorrents removeObject: torrent];
         [fDisplayedTorrents removeObject: torrent];
     }
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 7bf14864a..fdbd3807c 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -75,6 +75,8 @@
 
 - (NSDictionary *) history;
 
+- (void) removeTorrent;
+
 - (void) changeIncompleteDownloadFolder: (NSString *) folder;
 - (void) changeDownloadFolder: (NSString *) folder;
 - (NSString *) downloadFolder;
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 52a0d5305..f9a435b18 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -204,9 +204,6 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
         if (fPublicTorrentLocation)
             [fPublicTorrentLocation release];
         
-        #warning look into
-        tr_torrentRemoveSaved(fHandle);
-        
         [fDateAdded release];
 		if (fDateCompleted)
 			[fDateCompleted release];
@@ -234,6 +231,11 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
     [super dealloc];
 }
 
+- (void) removeTorrent
+{
+    tr_torrentRemoveSaved(fHandle);
+}
+
 - (void) changeIncompleteDownloadFolder: (NSString *) folder
 {
     fUseIncompleteFolder = folder != nil;