diff --git a/host/taskpoller.go b/host/taskpoller.go
index ed21ac9ba31..25d4c8dbdc6 100644
--- a/host/taskpoller.go
+++ b/host/taskpoller.go
@@ -372,7 +372,7 @@ retry:
 
 		if response == nil || len(response.TaskToken) == 0 {
 			p.Logger.Info("Empty Activity task: Polling again")
-			return nil
+			continue retry
 		}
 
 		if dropTask {