diff --git a/DSXActivityIndicator/DSXActivityIndicator/DSXActivityIndicator.m b/DSXActivityIndicator/DSXActivityIndicator/DSXActivityIndicator.m
index 9a007a1..716e583 100644
--- a/DSXActivityIndicator/DSXActivityIndicator/DSXActivityIndicator.m
+++ b/DSXActivityIndicator/DSXActivityIndicator/DSXActivityIndicator.m
@@ -44,6 +44,7 @@ - (void)setup {
 }
 
 - (void)startAnimating {
+    [self.indicatorImageView.layer removeAllAnimations];
     [[self.indicatorImageView layer] addAnimation:[self spinAnimation] forKey:@"spinAnimation"];
     _animating = YES;
     
@@ -59,7 +60,6 @@ - (void)stopAnimating {
                          [self.indicatorImageView setAlpha:0.0f];
                      }
                      completion:^(BOOL finished) {
-                         [self.indicatorImageView.layer removeAllAnimations];
                          _animating = NO;
                      }];
 }