diff --git a/macosx/Controller.m b/macosx/Controller.m
index e7c195bf4..e3e4854e3 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1781,7 +1781,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"com.apple.DownloadFileFinished"
             object: [[torrent downloadFolder] stringByAppendingPathComponent: [torrent name]]];
         
-        if ([self numToStartFromQueue: NO] == 0)
+        if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: NO] == 0)
         {
             [torrent stopTransfer];
             [torrent setWaitToStart: YES];
@@ -1796,7 +1796,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     Torrent * torrent = [notification object];
     if ([torrent isActive])
     {
-        if ([self numToStartFromQueue: YES] == 0)
+        if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: YES] == 0)
         {
             [torrent stopTransfer];
             [torrent setWaitToStart: YES];