diff --git a/features/cellular/framework/mux/cellular_mux.cpp b/features/cellular/framework/mux/cellular_mux.cpp
index 3d32cf92cf..092e9a4804 100644
--- a/features/cellular/framework/mux/cellular_mux.cpp
+++ b/features/cellular/framework/mux/cellular_mux.cpp
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if MBED_CONF_CELLULAR_MUX_ENABLED
+
 #include <errno.h>
 #include "cellular_mux.h"
 #include "mbed_retarget.h"
@@ -1251,3 +1253,5 @@ short Mux::poll()
 }
 
 } // namespace mbed
+
+#endif // MBED_CONF_CELLULAR_MUX_ENABLED
diff --git a/features/cellular/framework/mux/cellular_mux.h b/features/cellular/framework/mux/cellular_mux.h
index 1bfeef6754..bcd676a957 100644
--- a/features/cellular/framework/mux/cellular_mux.h
+++ b/features/cellular/framework/mux/cellular_mux.h
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if MBED_CONF_CELLULAR_MUX_ENABLED
+
 #ifndef MUX_H
 #define MUX_H
 
@@ -577,3 +579,5 @@ private:
 } // namespace mbed
 
 #endif
+
+#endif // MBED_CONF_CELLULAR_MUX_ENABLED
diff --git a/features/cellular/framework/mux/cellular_mux_data_service.cpp b/features/cellular/framework/mux/cellular_mux_data_service.cpp
index 3a381881f8..67424fc49f 100644
--- a/features/cellular/framework/mux/cellular_mux_data_service.cpp
+++ b/features/cellular/framework/mux/cellular_mux_data_service.cpp
@@ -14,6 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#if MBED_CONF_CELLULAR_MUX_ENABLED
+
 #include "cellular_mux.h"
 
 namespace mbed
@@ -57,3 +60,5 @@ void MuxDataService::sigio(Callback<void()> func)
 }
 
 } // namespace mbed
+
+#endif // MBED_CONF_CELLULAR_MUX_ENABLED
diff --git a/features/cellular/mbed_lib.json b/features/cellular/mbed_lib.json
index 89bcafa906..ca5945f8b4 100644
--- a/features/cellular/mbed_lib.json
+++ b/features/cellular/mbed_lib.json
@@ -1,9 +1,13 @@
 {
     "name": "cellular",
     "config": {
-        "use_apn_lookup": {
+        "use-apn-lookup": {
             "help": "Use APN database lookup",
             "value": true
+        },
+        "mux-enabled": {
+            "help": "Use cellular modem over MUX",
+            "value": false
         }
     }
 }
\ No newline at end of file