diff --git a/slsDetectorServers/eigerDetectorServer/Beb.c b/slsDetectorServers/eigerDetectorServer/Beb.c
index 629d0ba44..025aba2b1 100644
--- a/slsDetectorServers/eigerDetectorServer/Beb.c
+++ b/slsDetectorServers/eigerDetectorServer/Beb.c
@@ -8,8 +8,11 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
+extern int isControlServer;
+
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 
+
 struct LocalLinkInterface ll_beb_local, *ll_beb;
 
 struct udp_header_type udp_header;
@@ -97,6 +100,9 @@ int Beb_SetUpUDPHeader(unsigned int header_number, int ten_gig,
     if (!Beb_activated)
         return 1;
 
+    if (!isControlServer)
+        return 1;
+
     u_int32_t bram_phy_addr;
     u_int32_t *csp0base = 0;
     if (ten_gig)
diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
index dac09753c..d9d4bd1c3 100644
--- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
+++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
@@ -4969,25 +4969,27 @@ int is_udp_configured() {
 }
 
 void configure_mac() {
-    if (is_udp_configured() == OK) {
-        ret = configureMAC();
-        if (ret != OK) {
-#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
-            if (ret == -1) {
-                sprintf(mess, "Could not allocate RAM\n");
+    if (!isControlServer) {
+        if (is_udp_configured() == OK) {
+            ret = configureMAC();
+            if (ret != OK) {
+    #if defined(CHIPTESTBOARDD) || defined(MOENCHD)
+                if (ret == -1) {
+                    sprintf(mess, "Could not allocate RAM\n");
+                } else {
+                    sprintf(mess, "Could not configure mac because of incorrect "
+                                "udp 1G destination IP and port\n");
+                }
+    #else
+                sprintf(mess, "Configure Mac failed\n");
+    #endif
+                strcpy(configureMessage, mess);
+                LOG(logERROR, (mess));
             } else {
-                sprintf(mess, "Could not configure mac because of incorrect "
-                              "udp 1G destination IP and port\n");
+                LOG(logINFOGREEN, ("\tConfigure MAC successful\n"));
+                configured = OK;
+                return;
             }
-#else
-            sprintf(mess, "Configure Mac failed\n");
-#endif
-            strcpy(configureMessage, mess);
-            LOG(logERROR, (mess));
-        } else {
-            LOG(logINFOGREEN, ("\tConfigure MAC successful\n"));
-            configured = OK;
-            return;
         }
     }
     configured = FAIL;