diff --git a/src/components/ReceiverConnection.vue b/src/components/ReceiverConnection.vue
index f3f71d93..ce78f641 100644
--- a/src/components/ReceiverConnection.vue
+++ b/src/components/ReceiverConnection.vue
@@ -198,9 +198,11 @@ export default {
         if (e.extra.containsMic) {
           e.stream.containsMic = e.extra.containsMic;
         }
+        if (e.extra.roomDescription) {
+          e.stream.roomDescription = e.extra.roomDescription;
+        }
         this.$emit('stream', e.stream);
       };
-
       this.connection.onExtraDataUpdated = (e) => {
         this.$emit('receiverViewerCount', e.extra.receiverViewerCount);
       };
diff --git a/src/components/StreamerConnection.vue b/src/components/StreamerConnection.vue
index f77fc3c3..3702c0b0 100644
--- a/src/components/StreamerConnection.vue
+++ b/src/components/StreamerConnection.vue
@@ -37,6 +37,10 @@ export default {
       type: Boolean,
       default: false, 
     },
+    streamDescription: {
+      type: String,
+      default: '',
+    },
     isP2POnly: {
       type: Boolean,
       default: false,
@@ -289,6 +293,9 @@ export default {
           this.connection.isInitiator ? participantsCount : 0,
         );
       };
+
+      this.connection.extra.roomDescription = this.streamDescription;
+
     },
     setViewerCount(count) {
       this.$emit('viewerCount', count);
diff --git a/src/views/Receiver.vue b/src/views/Receiver.vue
index 420b30f7..166b7e2c 100644
--- a/src/views/Receiver.vue
+++ b/src/views/Receiver.vue
@@ -102,6 +102,7 @@ div
     router-link.create-message(v-if="!isStream", to="/streamer")
       | Create your own room
     PublicRooms.mt-40(v-if="!isStream")
+    | {{ stream.roomDescription}}
 </template>
 
 <script>
diff --git a/src/views/Streamer.vue b/src/views/Streamer.vue
index f0742e3f..2a585f70 100644
--- a/src/views/Streamer.vue
+++ b/src/views/Streamer.vue
@@ -165,6 +165,7 @@ div
     :privacy="privacy"
     :enableVideo="enableVideo"
     :enableAudio="enableAudio"
+    :streamDescription="streamDescription"
     :isP2POnly="isP2POnly"
     @sessionId="onSessionId"
     @viewerCount="onViewerCount"
@@ -229,6 +230,12 @@ div
               label.row-start
                 input(type="checkbox" v-model="enableMic")
                 | Enable Microphone
+              label.row-start
+                textarea(
+                  maxlength="280"
+                  v-model="streamDescription"
+                  placeholder="Add an optional room description"
+                )
             .col-xs-1-2
               label.row-start.mb-10
                 | Codec
@@ -348,6 +355,7 @@ export default {
       privacy: 'private',
       useridAlreadyTaken: '',
       enableMic: false,
+      streamDescription: '',
       showAdvancedOptions: false,
       isP2POnly: false,
     };