diff --git a/app/render/audioparams.h b/app/render/audioparams.h
index 7cfda60f3..b79c14ede 100644
--- a/app/render/audioparams.h
+++ b/app/render/audioparams.h
@@ -68,7 +68,7 @@ public:
     set_default_footage_parameters();
 
     // Cache channel count
-    channel_count_ = av_get_channel_layout_nb_channels(channel_layout());
+    calculate_channel_count();
   }
 
   AudioParams(const int& sample_rate, const uint64_t& channel_layout, const Format& format) :
@@ -80,7 +80,7 @@ public:
     timebase_ = sample_rate_as_time_base();
 
     // Cache channel count
-    channel_count_ = av_get_channel_layout_nb_channels(this->channel_layout());
+    calculate_channel_count();
   }
 
   int sample_rate() const
@@ -101,6 +101,7 @@ public:
   void set_channel_layout(uint64_t channel_layout)
   {
     channel_layout_ = channel_layout;
+    calculate_channel_count();
   }
 
   rational time_base() const
@@ -203,6 +204,11 @@ private:
     duration_ = 0;
   }
 
+  void calculate_channel_count()
+  {
+    channel_count_ = av_get_channel_layout_nb_channels(channel_layout());
+  }
+
   int sample_rate_;
 
   uint64_t channel_layout_;