diff --git a/src/components/codecs/AbstractCodecsModel.cpp b/src/components/codecs/AbstractCodecsModel.cpp
index 15abb820d..a35514c20 100644
--- a/src/components/codecs/AbstractCodecsModel.cpp
+++ b/src/components/codecs/AbstractCodecsModel.cpp
@@ -192,6 +192,10 @@ void AbstractCodecsModel::addDownloadableCodec (
 }
 
 QVariantMap AbstractCodecsModel::getCodecInfo (const QString &mime) const {
+  // TODO: Remove me in 4.2 release.
+  qDebug() << "Enable me in 4.2 release.";
+  return QVariantMap();
+
   for (const auto &codec : mCodecs)
     if (codec.value("mime") == mime)
       return codec;
diff --git a/src/components/codecs/VideoCodecsModel.cpp b/src/components/codecs/VideoCodecsModel.cpp
index 4cb25cd4c..6fa8fa367 100644
--- a/src/components/codecs/VideoCodecsModel.cpp
+++ b/src/components/codecs/VideoCodecsModel.cpp
@@ -20,6 +20,7 @@
  *      Author: Ronan Abhamon
  */
 
+#include <QDebug>
 #include <QDirIterator>
 #include <QLibrary>
 
@@ -83,6 +84,10 @@ void VideoCodecsModel::load () {
     addCodec(codec);
 
   // Add downloadable codecs.
+  // TODO: Remove me in 4.2 release.
+  qDebug() << "Enable downloadable codecs in 4.2 release.";
+  return;
+
   #if defined(Q_OS_LINUX) || defined(Q_OS_WIN)
     if (find_if(codecs.begin(), codecs.end(), [](const shared_ptr<linphone::PayloadType> &codec) {
       return codec->getMimeType() == "H264";