diff --git a/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.h b/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.h
index 30d8f2e57..d5efe5c71 100644
--- a/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.h
+++ b/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.h
@@ -56,7 +56,12 @@ FOUNDATION_EXPORT const CGFloat kJSQMessagesCollectionViewAvatarSizeDefault;
 /**
  *  The collection view object currently using this layout object.
  */
+
+// TODO: fix, rename "messagesCollectionView", see #920
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wincompatible-property-type"
 @property (readonly, nonatomic) JSQMessagesCollectionView *collectionView;
+#pragma clang diagnostic pop
 
 /**
  *  Specifies whether or not the layout should enable spring behavior dynamics for its items using `UIDynamics`.