diff --git a/queue/queue.go b/queue/queue.go
index 45e9a68b..c07d2038 100644
--- a/queue/queue.go
+++ b/queue/queue.go
@@ -27,6 +27,9 @@ type Store struct {
 func (db *Store) Next(ctx context.Context, resp mdm.Response) (*Command, error) {
 	dc, err := db.DeviceCommand(resp.UDID)
 	if err != nil {
+		if isNotFound(err) {
+			return nil, nil
+		}
 		return nil, errors.Wrapf(err, "get device command from queue, udid: %s", resp.UDID)
 	}
 
diff --git a/queue/queue_test.go b/queue/queue_test.go
index bc123bb8..6579f062 100644
--- a/queue/queue_test.go
+++ b/queue/queue_test.go
@@ -136,8 +136,8 @@ func TestNext_zeroCommands(t *testing.T) {
 		t.Run(s, func(t *testing.T) {
 			resp := mdm.Response{CommandUUID: s, Status: s}
 			cmd, err := store.Next(ctx, resp)
-			if err == nil {
-				t.Error("expected err but got nil")
+			if err != nil {
+				t.Errorf("expected nil, but got err: %s", err)
 			}
 			if cmd != nil {
 				t.Errorf("expected nil cmd but got %s", cmd.UUID)