diff --git a/src/components/rooms.js b/src/components/rooms.js
index e872374..65cf338 100644
--- a/src/components/rooms.js
+++ b/src/components/rooms.js
@@ -116,6 +116,7 @@ export const RoomCreate = props => (
           placeholder="#"
         />
         <BooleanInput source="public" label="synapseadmin.rooms.make_public" />
+        <BooleanInput source="encrypt" initialValue={true} label="synapseadmin.rooms.encrypt" />
       </FormTab>
       <FormTab
         label="resources.rooms.fields.invite_members"
diff --git a/src/i18n/de.js b/src/i18n/de.js
index 14abc0a..a988057 100644
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -23,6 +23,7 @@ export default {
       details: "Raumdetails",
       room_name: "Raumname",
       make_public: "Öffentlicher Raum",
+      encrypt: "Verschlüsselter Raum",
       room_name_required: "Muss angegeben werden",
       alias_required_if_public: "Muss für öffentliche Räume angegeben werden.",
       alias: "Alias",
diff --git a/src/i18n/en.js b/src/i18n/en.js
index f1e6f51..a1db339 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -23,6 +23,7 @@ export default {
       details: "Room Details",
       room_name: "Room Name",
       make_public: "Make room public",
+      encrypt: "Encrypt room",
       room_name_required: "Must be provided",
       alias_required_if_public: "Must be provided for a public room",
       alias: "Alias",
diff --git a/src/synapse/dataProvider.js b/src/synapse/dataProvider.js
index de29f08..97877b2 100644
--- a/src/synapse/dataProvider.js
+++ b/src/synapse/dataProvider.js
@@ -56,6 +56,14 @@ const resourceMap = {
           Array.isArray(data.invitees) && data.invitees.length > 0
             ? data.invitees
             : undefined,
+        initial_state: data.encrypt ? [{
+                            type: 'm.room.encryption',
+                            state_key: '',
+                            content: {
+                                algorithm: 'm.megolm.v1.aes-sha2',
+                            }
+                          }] : undefined,
+        ,
       },
       method: "POST",
     })