diff --git a/OSXvnc-server/main.c b/OSXvnc-server/main.c
index 6d84026..b7c6ffc 100644
--- a/OSXvnc-server/main.c
+++ b/OSXvnc-server/main.c
@@ -1047,7 +1047,7 @@ void rfbShutdown(void) {
     [[NSNotificationCenter defaultCenter] removeObserver:vncServerObject];
     [[NSDistributedNotificationCenter defaultCenter] removeObserver:vncServerObject];
 
-    if (rfbDisableScreenSaver) {
+    if (rfbDisableScreenSaver || rfbNoSleep) {
         /* remove the screensaver timer */
         RemoveEventLoopTimer(screensaverTimer);
         DisposeEventLoopTimerUPP(screensaverTimerUPP);
@@ -1255,7 +1255,7 @@ int main(int argc, char *argv[]) {
     // Better to handle this at the event level, see kbdptr.c
     //CGEnableEventStateCombining(FALSE);
 
-    if (rfbDisableScreenSaver) {
+    if (rfbDisableScreenSaver || rfbNoSleep) {
         /* setup screen saver disabling timer */
         screensaverTimerUPP = NewEventLoopTimerUPP(rfbScreensaverTimer);
         InstallEventLoopTimer(GetMainEventLoop(),