diff --git a/ant/src/ant/channel/channel.cpp b/ant/src/ant/channel/channel.cpp
index 05a3e53..d1b6543 100644
--- a/ant/src/ant/channel/channel.cpp
+++ b/ant/src/ant/channel/channel.cpp
@@ -33,7 +33,7 @@ void Channel::_bind_methods() {
 Channel::Channel() {
   channel_config_.frequency = 57;
   channel_config_.transmission_type = 0;
-  device_number_ = DeviceNumbers::Wildcard;
+  channel_config_.device_number = DeviceNumbers::Wildcard;
   channel_ = 0;
 }
 
diff --git a/ant/src/ant/channel/channel.hpp b/ant/src/ant/channel/channel.hpp
index 647b7af..ef41c5c 100644
--- a/ant/src/ant/channel/channel.hpp
+++ b/ant/src/ant/channel/channel.hpp
@@ -91,9 +91,9 @@ protected:
     state_ = _state;
   }
   void SetDeviceNumber(const DeviceNumber device_number) {
-    device_number_ = device_number;
+    channel_config_.device_number = device_number;
   }
-  DeviceNumber GetDeviceNumber() const { return device_number_; }
+  DeviceNumber GetDeviceNumber() const { return channel_config_.device_number; }
 
   void SetChannel(const ChannelNumber channel) { channel_ = channel; }
   ChannelNumber GetChannel() const { return channel_; }
@@ -112,7 +112,6 @@ protected:
 
   // PROPERTIES
   ChannelNumber channel_;
-  DeviceNumber device_number_;
 
 private:
   void Initialize();