diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 2dec5ce5a..1843ac02c 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -286,7 +286,7 @@
           isRss: this.model.isRss(),
           memberCount: members.length,
 
-          /* timerOptions: Whisper.ExpirationTimerOptions.map(item => ({
+          timerOptions: Whisper.ExpirationTimerOptions.map(item => ({
             name: item.getName(),
             value: item.get('seconds'),
           })),
@@ -294,7 +294,6 @@
           onSetDisappearingMessages: seconds =>
             this.setDisappearingMessages(seconds),
 
-           */
           onGoBack: () => {
             this.$('.conversation-content-right').hide();
           },
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 12a873075..f2a72432f 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -16,7 +16,7 @@ import {
   SessionButtonType,
 } from '../session/SessionButton';
 
-interface TimerOption {
+export interface TimerOption {
   name: string;
   value: number;
 }
diff --git a/ts/components/session/SessionChannelSettings.tsx b/ts/components/session/SessionChannelSettings.tsx
index 523864cfb..b625cbea7 100644
--- a/ts/components/session/SessionChannelSettings.tsx
+++ b/ts/components/session/SessionChannelSettings.tsx
@@ -8,6 +8,7 @@ import {
 } from './SessionButton';
 import { MediaGallery } from '../conversation/media-gallery/MediaGallery';
 import _ from 'lodash';
+import { TimerOption } from '../conversation/ConversationHeader';
 
 interface Props {
   id: string;
@@ -15,11 +16,13 @@ interface Props {
   memberCount: number;
   description: string;
   avatarPath: string;
+  timerOptions: Array<TimerOption>;
 
   onGoBack: () => void;
   onInviteFriends: () => void;
   onLeaveGroup: () => void;
   onShowLightBox: (options: any) => void;
+  onSetDisappearingMessages: (seconds: number) => void;
 }
 
 export class SessionChannelSettings extends React.Component<Props, any> {