diff --git a/grc/gen_bladerf_blocks.py b/grc/gen_bladerf_blocks.py
index 9df9098d73933f6d0f3dcae7625da20c67c2f2db..9fba633c3d86d9877c9774bebe55b3ad2b9496c7 100644
--- a/grc/gen_bladerf_blocks.py
+++ b/grc/gen_bladerf_blocks.py
@@ -34,6 +34,13 @@ parameters:
       type: [fc32]
   hide: part
   
+- id: metadata
+  label: Metadata
+  dtype: enum
+  default: auto
+  options: ['False', 'True']
+  hide: part
+  
 - id: device_id
   label: 'Device'
   dtype: string
@@ -162,6 +169,7 @@ templates:
     bladeRF.${sourk}(
         args="numchan=" + str(${'$'}{nchan})
              + ",type=" + '${'$'}{type}'
+             + ",metadata=" + '${'$'}{metadata}'
              + ",bladerf=" +  str(${'$'}{device_id})
              + ",verbosity=" + '${'$'}{verbosity}'
              + ",fpga=" + str(${'$'}{fpga_image})
diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc
index 46d86f961b15a8aa8d1056597f6f6cdae5e908af..48882bed63e7b82d574edfe8d46c95ae58e08577 100644
--- a/lib/bladerf/bladerf_common.cc
+++ b/lib/bladerf/bladerf_common.cc
@@ -311,7 +311,7 @@ void bladerf_common::init(dict_t const &dict, bladerf_direction direction)
     _stream_timeout = boost::lexical_cast<unsigned int>(_get(dict, "stream_timeout_ms"));
   }
 
-  if (dict.count("enable_metadata") > 0) {
+  if (dict.count("metadata") && _get(dict, "metadata") == "True") {
     _format = BLADERF_FORMAT_SC16_Q11_META;
   }