diff --git a/src/org/jitsi/impl/neomedia/MediaUtils.java b/src/org/jitsi/impl/neomedia/MediaUtils.java
index a8616d19b8d33fc4ef309e2022e04e963024d9aa..0fd86859d6200417c2a951c08ff1ba887f2db8cd 100644
--- a/src/org/jitsi/impl/neomedia/MediaUtils.java
+++ b/src/org/jitsi/impl/neomedia/MediaUtils.java
@@ -212,11 +212,20 @@ public class MediaUtils
 
         h264AdvancedAttributes.put("imageattr", createImageAttr(null, res));
 
-        // packetization-mode=1
-        h264FormatParams.put(packetizationMode, "1");
-
         ConfigurationService cfg = LibJitsi.getConfigurationService();
 
+        // by default packetization mode 1 is enabled
+        if ((cfg == null)
+                || cfg
+                    .getBoolean(
+                        "net.java.sip.communicator.impl.neomedia" +
+                            ".codec.video.h264.packetization-mode-1.enabled",
+                            true))
+        {
+            // packetization-mode=1
+            h264FormatParams.put(packetizationMode, "1");
+        }
+
         if ((cfg == null)
                 || cfg
                     .getString(