diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3089dd70..dbf8a4ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [Unreleased]
+### Fixed
+- Switched channel `RF_inputs` and `RF_outputs` for Octave
+
 
 ## [0.3.0]
 ### Added
diff --git a/quam/components/channels.py b/quam/components/channels.py
index 654d658a..f139ee72 100644
--- a/quam/components/channels.py
+++ b/quam/components/channels.py
@@ -590,7 +590,7 @@ def apply_to_config(self, config: dict):
                     f"OctaveUpConverter (id={self.frequency_converter_up.id}) without "
                     "an attached Octave"
                 )
-            element_cfg["RF_outputs"] = {
+            element_cfg["RF_inputs"] = {
                 "port": (octave.name, self.frequency_converter_up.id)
             }
         elif str_ref.is_reference(self.frequency_converter_up):
@@ -697,7 +697,7 @@ def apply_to_config(self, config: dict):
                     f"OctaveDownConverter (id={self.frequency_converter_down.id}) "
                     "without an attached Octave"
                 )
-            element_cfg["RF_inputs"] = {
+            element_cfg["RF_outputs"] = {
                 "port": (octave.name, self.frequency_converter_down.id)
             }
         elif str_ref.is_reference(self.frequency_converter_down):
diff --git a/quam/components/octave.py b/quam/components/octave.py
index 4b2debdf..6ad0266a 100644
--- a/quam/components/octave.py
+++ b/quam/components/octave.py
@@ -262,7 +262,7 @@ def apply_to_config(self, config: Dict) -> None:
         if self.id in config["octaves"][self.octave.name]["RF_outputs"]:
             raise KeyError(
                 f"Error generating config: "
-                f'config["octaves"]["{self.octave.name}"]["RF_inputs"] '
+                f'config["octaves"]["{self.octave.name}"]["RF_outputs"] '
                 f'already has an entry for OctaveDownConverter with id "{self.id}"'
             )