diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
index 268fd8df7..807a35df6 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@@ -281,9 +281,7 @@ const CGFloat kIconViewLength = 24;
                                  [weakSelf showMediaGallery];
                              }]];
 
-
-//#define SHOW_CONVERSATION_COLORS_UI
-#ifdef SHOW_CONVERSATION_COLORS_UI
+#ifdef CONVERSATION_COLORS_ENABLED
     [mainSection addItem:[OWSTableItem
                              itemWithCustomCellBlock:^{
                                  NSString *colorName = self.thread.conversationColorName;
diff --git a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
index 87cda89df..fdcb5a8c2 100644
--- a/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
+++ b/SignalServiceKit/src/Devices/OWSContactsOutputStream.m
@@ -34,7 +34,9 @@ disappearingMessagesConfiguration:(nullable OWSDisappearingMessagesConfiguration
     OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new];
     [contactBuilder setName:signalAccount.contact.fullName];
     [contactBuilder setNumber:signalAccount.recipientId];
+#ifdef CONVERSATION_COLORS_ENABLED
     [contactBuilder setColor:conversationColorName];
+#endif
 
     if (recipientIdentity != nil) {
         OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
diff --git a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
index 2dd42492d..99051ab2a 100644
--- a/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
+++ b/SignalServiceKit/src/Devices/OWSGroupsOutputStream.m
@@ -26,7 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
     [groupBuilder setId:group.groupId];
     [groupBuilder setName:group.groupName];
     [groupBuilder setMembersArray:group.groupMemberIds];
+#ifdef CONVERSATION_COLORS_ENABLED
     [groupBuilder setColor:groupThread.conversationColorName];
+#endif
 
     NSData *avatarPng;
     if (group.groupImage) {
diff --git a/SignalServiceKit/src/TSConstants.h b/SignalServiceKit/src/TSConstants.h
index bfde2bb48..2ab6e363f 100644
--- a/SignalServiceKit/src/TSConstants.h
+++ b/SignalServiceKit/src/TSConstants.h
@@ -17,6 +17,8 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
 
 #define textSecureHTTPTimeOut 10
 
+//#define CONVERSATION_COLORS_ENABLED
+
 #define kLegalTermsUrlString @"https://signal.org/legal/"
 #define SHOW_LEGAL_TERMS_LINK