diff --git a/src/app/neochatconfig.kcfg b/src/app/neochatconfig.kcfg
index fbe76d769..d338982b8 100644
--- a/src/app/neochatconfig.kcfg
+++ b/src/app/neochatconfig.kcfg
@@ -205,6 +205,10 @@
       <label>Enable add phone numbers as 3PIDs</label>
       <default>false</default>
     </entry>
+    <entry name="Calls" type="bool">
+      <label>Enable audio and video calling</label>
+      <default>false</default>
+    </entry>
   </group>
   <group name="Security">
     <entry name="RejectUnknownInvites" type="bool">
diff --git a/src/devtools/FeatureFlagPage.qml b/src/devtools/FeatureFlagPage.qml
index 47c4d994e..fe9c18966 100644
--- a/src/devtools/FeatureFlagPage.qml
+++ b/src/devtools/FeatureFlagPage.qml
@@ -36,4 +36,13 @@ FormCard.FormCard {
             NeoChatConfig.save();
         }
     }
+    FormCard.FormCheckDelegate {
+        text: i18nc("@option:check Enable the matrix feature for audio and video calling", "Calls")
+        checked: NeoChatConfig.calls
+
+        onToggled: {
+            NeoChatConfig.calls = checked;
+            NeoChatConfig.save();
+        }
+    }
 }