diff --git a/src/Messages/Interactions/TSInteraction.h b/src/Messages/Interactions/TSInteraction.h
index 6f7c4eeee..b91b05d3c 100644
--- a/src/Messages/Interactions/TSInteraction.h
+++ b/src/Messages/Interactions/TSInteraction.h
@@ -4,6 +4,8 @@
 
 #import "TSYapDatabaseObject.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class TSThread;
 
 @interface TSInteraction : TSYapDatabaseObject
@@ -34,3 +36,5 @@
 - (nullable NSDate *)receiptDateForSorting;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/src/Messages/Interactions/TSInteraction.m b/src/Messages/Interactions/TSInteraction.m
index 9b028cb02..39937faa3 100644
--- a/src/Messages/Interactions/TSInteraction.m
+++ b/src/Messages/Interactions/TSInteraction.m
@@ -7,6 +7,8 @@
 #import "TSStorageManager+messageIDs.h"
 #import "TSThread.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @implementation TSInteraction
 
 + (instancetype)interactionForTimestamp:(uint64_t)timestamp
@@ -108,3 +110,5 @@
 }
 
 @end
+
+NS_ASSUME_NONNULL_END