diff --git a/Riot/Riot-Defaults.plist b/Riot/Riot-Defaults.plist
index da87bc19d..3c6e0446b 100644
--- a/Riot/Riot-Defaults.plist
+++ b/Riot/Riot-Defaults.plist
@@ -42,6 +42,8 @@
 	<false/>
 	<key>syncLocalContacts</key>
 	<false/>
+	<key>createConferenceCallsWithJitsi</key>
+	<true/>
 	<key>maxAllowedMediaCacheSize</key>
 	<integer>1073741824</integer>
 	<key>presenceColorForOnlineUser</key>
diff --git a/Riot/Utils/RiotDesignValues.h b/Riot/Utils/RiotDesignValues.h
index 034a28ef5..d3239d1c1 100644
--- a/Riot/Utils/RiotDesignValues.h
+++ b/Riot/Utils/RiotDesignValues.h
@@ -62,11 +62,6 @@ extern UIStatusBarStyle kRiotDesignStatusBarStyle;
 extern UIBarStyle kRiotDesignSearchBarStyle;
 extern UIColor *kRiotDesignSearchBarTintColor;
 
-// Flag to enable the display of jitsi conference widget
-// TODO: Disable it before release
-// TODO: Remove it once Riot web and android are ready
-#define USE_JITSI_WIDGET
-
 /**
  `RiotDesignValues` class manages the Riot design parameters
  */
diff --git a/Riot/ViewController/RoomViewController.m b/Riot/ViewController/RoomViewController.m
index dc2c4a079..81413a5f3 100644
--- a/Riot/ViewController/RoomViewController.m
+++ b/Riot/ViewController/RoomViewController.m
@@ -2738,7 +2738,6 @@
 {
      __weak __typeof(self) weakSelf = self;
 
-#ifdef USE_JITSI_WIDGET
     // If there is already a jitsi widget, join it
     Widget *jitsiWidget = [customizedRoomDataSource jitsiWidget];
     if (jitsiWidget)
@@ -2775,11 +2774,8 @@
              }
          }];
     }
-    else
-#endif
-
     // Classic conference call is not supported in encrypted rooms
-    if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.joinedMembers.count > 2)
+    else if (self.roomDataSource.room.state.isEncrypted && self.roomDataSource.room.state.joinedMembers.count > 2)
     {
         [currentAlert dismissViewControllerAnimated:NO completion:nil];
 
@@ -3540,7 +3536,6 @@
                 } onClosePressed:nil];
             }
         }
-#ifdef USE_JITSI_WIDGET
         else if (jitsiWidget)
         {
             // The room has an active jitsi widget
@@ -3610,7 +3605,6 @@
                 }];
             }
         }
-#endif
         else if ([self checkUnsentMessages] == NO)
         {
             // Show "scroll to bottom" icon when the most recent message is not visible,
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index 01462e21b..fa864b072 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -101,9 +101,7 @@ enum
 enum
 {
     LABS_MATRIX_APPS_INDEX = 0,
-#ifdef USE_JITSI_WIDGET
     LABS_USE_JITSI_WIDGET_INDEX,
-#endif
     LABS_CRYPTO_INDEX,
     LABS_COUNT
 };
@@ -1957,7 +1955,6 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
 
             cell = labelAndSwitchCell;
         }
-#ifdef USE_JITSI_WIDGET
         else if (row == LABS_USE_JITSI_WIDGET_INDEX)
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];
@@ -1970,9 +1967,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
 
             cell = labelAndSwitchCell;
         }
-        else
-#endif
-        if (row == LABS_CRYPTO_INDEX)
+        else if (row == LABS_CRYPTO_INDEX)
         {
             MXSession* session = [[AppDelegate theDelegate].mxSessions objectAtIndex:0];