diff --git a/Source/IGListKit/IGListAdapter.m b/Source/IGListKit/IGListAdapter.m
index b32d8d57..72db9d0d 100644
--- a/Source/IGListKit/IGListAdapter.m
+++ b/Source/IGListKit/IGListAdapter.m
@@ -978,7 +978,7 @@ typedef struct OffsetRange {
     return self.collectionView.bounds.size;
 }
 
-- (UITraitCollection *_Nullable)traitCollection {
+- (UITraitCollection *)traitCollection {
     return self.collectionView.traitCollection;
 }
 
diff --git a/Source/IGListKit/IGListCollectionContext.h b/Source/IGListKit/IGListCollectionContext.h
index 86569768..6f0a550c 100644
--- a/Source/IGListKit/IGListCollectionContext.h
+++ b/Source/IGListKit/IGListCollectionContext.h
@@ -26,8 +26,6 @@ NS_ASSUME_NONNULL_BEGIN
 NS_SWIFT_NAME(ListCollectionContext)
 @protocol IGListCollectionContext <NSObject>
 
-@property (nonatomic, nullable, readonly) UITraitCollection *traitCollection;
-
 /**
  The size of the collection view. You can use this for sizing cells.
  */
@@ -53,6 +51,11 @@ NS_SWIFT_NAME(ListCollectionContext)
  */
 @property (nonatomic, readonly) CGPoint containerContentOffset;
 
+/**
+ The trait collection of the collection view.
+ */
+@property (nonatomic, nullable, readonly) UITraitCollection *traitCollection;
+
 /**
  The current scrolling traits of the underlying collection view.
  */
diff --git a/Tests/IGListAdapterTests.m b/Tests/IGListAdapterTests.m
index a08253d0..7ee8bdd4 100644
--- a/Tests/IGListAdapterTests.m
+++ b/Tests/IGListAdapterTests.m
@@ -1736,6 +1736,12 @@
     XCTAssertEqual(size.height, 0.0);
 }
 
+- (void)test_whenQueryingTraitCollection_thatMatchesCollectionView {
+    self.dataSource.objects = @[@2];
+    [self.adapter reloadDataWithCompletion:nil];
+    XCTAssertEqual(self.adapter.traitCollection, self.collectionView.traitCollection);
+}
+
 - (void)test_whenQueryingContainerInset_thatMatchesCollectionView {
     self.dataSource.objects = @[@2];
     [self.adapter reloadDataWithCompletion:nil];