Fix on the infinite looping of spinner

Reviewer: Chezka Arevalo

Issue: infinite spinner