diff --git a/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m b/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m
index e317559572..d2f7465349 100644
--- a/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m
+++ b/AsyncDisplayKit/TextKit/ASTextKitCoreTextAdditions.m
@@ -88,7 +88,7 @@ NSDictionary *NSAttributedStringAttributesForCoreTextAttributes(NSDictionary *co
       cleanAttributes[NSForegroundColorAttributeName] = [UIColor colorWithCGColor:(CGColorRef)coreTextValue];
     }
     // kCTParagraphStyleAttributeName -> NSParagraphStyleAttributeName
-    else if ([coreTextKey isEqualToString:(NSString *)kCTParagraphStyleAttributeName]) {
+    else if ([coreTextKey isEqualToString:(NSString *)kCTParagraphStyleAttributeName] && ![coreTextValue isKindOfClass:[NSParagraphStyle class]]) {
       cleanAttributes[NSParagraphStyleAttributeName] = [NSParagraphStyle paragraphStyleWithCTParagraphStyle:(CTParagraphStyleRef)coreTextValue];
     }
     // kCTStrokeWidthAttributeName -> NSStrokeWidthAttributeName
diff --git a/AsyncDisplayKitTests/ASTextKitCoreTextAdditionsTests.m b/AsyncDisplayKitTests/ASTextKitCoreTextAdditionsTests.m
index a33c9e2313..6fa7fd7aed 100644
--- a/AsyncDisplayKitTests/ASTextKitCoreTextAdditionsTests.m
+++ b/AsyncDisplayKitTests/ASTextKitCoreTextAdditionsTests.m
@@ -12,6 +12,11 @@
 
 #import "ASTextKitCoreTextAdditions.h"
 
+BOOL floatsCloseEnough(CGFloat float1, CGFloat float2) {
+  CGFloat epsilon = 0.00001;
+  return (fabs(float1 - float2) < epsilon);
+}
+
 @interface ASTextKitCoreTextAdditionsTests : XCTestCase
 
 @end
@@ -44,5 +49,21 @@
   XCTAssertTrue([testString isEqualToAttributedString:actualCleansedString], @"Expected the output string %@ to be the same as the input %@ if there are no core text attributes", actualCleansedString, testString);
 }
 
+- (void)testNSParagraphStyleNoCleansing
+{
+  NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+  paragraphStyle.lineSpacing = 10.0;
+
+  //NSUnderlineStyleAttributeName flags the unsupported CT attribute check
+  NSDictionary *attributes = @{NSParagraphStyleAttributeName:paragraphStyle,
+                               NSUnderlineStyleAttributeName:@(NSUnderlineStyleSingle)};
+
+  NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:@"Test" attributes:attributes];
+  NSAttributedString *cleansedString = ASCleanseAttributedStringOfCoreTextAttributes(attributedString);
+
+  NSParagraphStyle *cleansedParagraphStyle = [cleansedString attribute:NSParagraphStyleAttributeName atIndex:0 effectiveRange:NULL];
+
+  XCTAssertTrue(floatsCloseEnough(cleansedParagraphStyle.lineSpacing, paragraphStyle.lineSpacing), @"Expected the output line spacing: %f to be equal to the input line spacing: %f", cleansedParagraphStyle.lineSpacing, paragraphStyle.lineSpacing);
+}
 
 @end