diff --git a/src/server/simpleslave.c b/src/server/simpleslave.c
--- a/src/server/simpleslave.c
+++ b/src/server/simpleslave.c
@@ -212,8 +212,10 @@ int main(int argc, char *argv[])
           _web_finishframe(slavekey, password, jobnum, framenum);
         }
       }
-    else
+    else{
       fprintf(stderr,"Nothing to do. Idling...\n");
+      sleep(300); // Poll every 300 seconds @TODO: remove polling
+    }
 
     // @TODO: If the server says that every frame for the last jobnum is finished, OR if the data is getting old
     if(1 == 0)
@@ -222,8 +224,6 @@ int main(int argc, char *argv[])
         // except for ones that couldn't be uploaded
         delete_jobdata(jobnum, datadir);
       }
-
-    sleep(300); // Poll every 300 seconds @TODO: remove polling
   }
 
   fprintf(stderr,"Goodbye!\n");