diff --git a/platform/queue/queue.go b/platform/queue/queue.go
index 298bdc13..f9d4e783 100644
--- a/platform/queue/queue.go
+++ b/platform/queue/queue.go
@@ -164,8 +164,12 @@ func (db *Store) nextCommand(ctx context.Context, resp mdm.Response) (*Command,
 		}
 	}
 
-	if err := db.Save(dc); err != nil {
-		return nil, err
+	// we only need to Save if there are command queue changes such as
+	// NowNow and Acknowledged responses or a new popped command.
+	if resp.Status != "Idle" || cmd != nil {
+		if err := db.Save(dc); err != nil {
+			return nil, err
+		}
 	}
 
 	return cmd, nil