diff --git a/src/main.cpp b/src/main.cpp
index 273920371..1986d3907 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1284,11 +1284,7 @@ static int adjust_params(struct ug_options *opt) {
         }
 
         if (opt->video_tx_port == -1) {
-                if ((opt->video_rxtx_mode & MODE_SENDER) == 0U) {
-                        opt->video_tx_port = 0; // does not matter, we are receiver
-                } else {
-                        opt->video_tx_port = opt->port_base;
-                }
+                opt->video_tx_port = opt->port_base;
         }
 
         if (opt->audio.recv_port == -1) {
@@ -1302,11 +1298,7 @@ static int adjust_params(struct ug_options *opt) {
         }
 
         if (opt->audio.send_port == -1) {
-                if ((audio_rxtx_mode & MODE_SENDER) == 0U) {
-                        opt->audio.send_port = 0;
-                } else {
-                        opt->audio.send_port = opt->video_tx_port ? opt->video_tx_port + 2 : opt->port_base + 2;
-                }
+                opt->audio.send_port = opt->video_tx_port ? opt->video_tx_port + 2 : opt->port_base + 2;
         }
 
         // If we are sure that this UltraGrid is sending to itself we can optimize some parameters