diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad5380e9..3a6e4eb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### 0.9.17
+- **Fix**: SpinnerView infinity animation.
+
 ### 0.9.16
 - **Add**: `LabelTableViewCell` moved from `LeadKitAdditions`.
 - **Add**: `SnapKit` dependency.
diff --git a/LeadKit.podspec b/LeadKit.podspec
index 09536763..7944d1c1 100644
--- a/LeadKit.podspec
+++ b/LeadKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name            = "LeadKit"
-  s.version         = "0.9.16"
+  s.version         = "0.9.17"
   s.summary         = "iOS framework with a bunch of tools for rapid development"
   s.homepage        = "https://github.com/TouchInstinct/LeadKit"
   s.license         = "Apache License, Version 2.0"
diff --git a/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift b/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift
index 9fff9a21..0f8cc892 100644
--- a/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift
+++ b/Sources/Extensions/CABasicAnimation/CABasicAnimation+Rotation.swift
@@ -27,7 +27,7 @@ extension CABasicAnimation {
     static let rotationKeyPath = "transform.rotation.z"
 
     static func zRotationAnimationWith(duration: CFTimeInterval = 1,
-                                       repeatCount: Float = Float.infinity,
+                                       repeatCount: Float = .infinity,
                                        clockwise: Bool = true) -> CABasicAnimation {
 
         let animation = CABasicAnimation(keyPath: CABasicAnimation.rotationKeyPath)
@@ -36,6 +36,9 @@ extension CABasicAnimation {
         animation.duration = duration
         animation.isCumulative = true
         animation.repeatCount = repeatCount
+        if repeatCount == .infinity {
+            animation.isRemovedOnCompletion = false
+        }
 
         return animation
     }
diff --git a/Sources/Info-iOS.plist b/Sources/Info-iOS.plist
index 990188d8..3cdbc79b 100644
--- a/Sources/Info-iOS.plist
+++ b/Sources/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.16</string>
+	<string>0.9.17</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/Sources/Info-tvOS.plist b/Sources/Info-tvOS.plist
index 990188d8..3cdbc79b 100644
--- a/Sources/Info-tvOS.plist
+++ b/Sources/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.16</string>
+	<string>0.9.17</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
diff --git a/Sources/Info-watchOS.plist b/Sources/Info-watchOS.plist
index 990188d8..3cdbc79b 100644
--- a/Sources/Info-watchOS.plist
+++ b/Sources/Info-watchOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.16</string>
+	<string>0.9.17</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>