diff --git a/config.js b/config.js
index 1d124aa25..da2624aba 100644
--- a/config.js
+++ b/config.js
@@ -262,17 +262,6 @@ var config = {
     // applied locally. FIXME: having these 2 options is confusing.
     // startWithVideoMuted: false,
 
-    // If set to true, prefer to use the H.264 video codec (if supported).
-    // Note that it's not recommended to do this because simulcast is not
-    // supported when  using H.264. For 1-to-1 calls this setting is enabled by
-    // default and can be toggled in the p2p section.
-    // This option has been deprecated, use preferredCodec under videoQuality section instead.
-    // preferH264: true,
-
-    // If set to true, disable H.264 video codec by stripping it out of the
-    // SDP.
-    // disableH264: false,
-
     // Desktop sharing
 
     // Optional desktop sharing frame rate options. Default value: min:5, max:5.
@@ -923,18 +912,10 @@ var config = {
         // If not set, the effective value is 'all'.
         // iceTransportPolicy: 'all',
 
-        // If set to true, it will prefer to use H.264 for P2P calls (if H.264
-        // is supported). This setting is deprecated, use preferredCodec instead.
-        // preferH264: true,
-
         // Provides a way to set the video codec preference on the p2p connection. Acceptable
         // codec values are 'VP8', 'VP9' and 'H264'.
         // preferredCodec: 'H264',
 
-        // If set to true, disable H.264 video codec by stripping it out of the
-        // SDP. This setting is deprecated, use disabledCodec instead.
-        // disableH264: false,
-
         // Provides a way to prevent a video codec from being negotiated on the p2p connection.
         // disabledCodec: '',
 
diff --git a/react/features/base/config/configType.ts b/react/features/base/config/configType.ts
index df96d09fb..c3008e690 100644
--- a/react/features/base/config/configType.ts
+++ b/react/features/base/config/configType.ts
@@ -233,7 +233,6 @@ export interface IConfig {
     disableChatSmileys?: boolean;
     disableDeepLinking?: boolean;
     disableFilmstripAutohiding?: boolean;
-    disableH264?: boolean;
     disableIncomingMessageSound?: boolean;
     disableInitialGUM?: boolean;
     disableInviteFunctions?: boolean;
@@ -414,12 +413,10 @@ export interface IConfig {
     opusMaxAverageBitrate?: number;
     p2p?: {
         backToP2PDelay?: number;
-        disableH264?: boolean;
         disabledCodec?: string;
         enableUnifiedOnChrome?: boolean;
         enabled?: boolean;
         iceTransportPolicy?: string;
-        preferH264?: boolean;
         preferredCodec?: string;
         stunServers?: Array<{ urls: string; }>;
     };
@@ -430,7 +427,6 @@ export interface IConfig {
     };
     pcStatsInterval?: number;
     peopleSearchUrl?: string;
-    preferH264?: boolean;
     preferredTranscribeLanguage?: string;
     prejoinConfig?: {
         enabled?: boolean;
diff --git a/react/features/base/config/configWhitelist.ts b/react/features/base/config/configWhitelist.ts
index a4cd334f2..da5197558 100644
--- a/react/features/base/config/configWhitelist.ts
+++ b/react/features/base/config/configWhitelist.ts
@@ -101,7 +101,6 @@ export default [
     'disabledSounds',
     'disableFilmstripAutohiding',
     'disableInitialGUM',
-    'disableH264',
     'disableHPF',
     'disableInviteFunctions',
     'disableIncomingMessageSound',
@@ -199,7 +198,6 @@ export default [
     'p2p',
     'participantsPane',
     'pcStatsInterval',
-    'preferH264',
     'preferredCodec',
     'prejoinConfig',
     'prejoinPageEnabled',