diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
index 63ea1b0ee..80bc14535 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
@@ -245,23 +245,22 @@ int setPhaseShiftOnce(){
 }
 
 
-int setDAQRegister()
+int setDAQRegister(int adcval)
 {
   u_int32_t addr, reg, val;
-  int result=OK;
+
   addr=DAQ_REG;
-  val=34+(42<<8)+(319<<16);
+  int value=0x7f;
+  if(adcval==-1) value=0x13f;
+  val=34+(42<<8)+(value<<16);
   reg=bus_r(addr);
-  //write to daqreg if not valid
-  if(reg!=val){
-    bus_w(addr,val);
-    reg=bus_r(addr);
-    if(reg!=val)
-      result=FAIL;
-  }
-#ifdef VERBOSE
-  printf("DAQ reg:20916770:%d",reg);
-#endif
+  bus_w(addr,val);
+  reg=bus_r(addr);
+//#ifdef VERBOSE
+  printf("DAQ reg:%x",reg);
+//#endif
+
+
   addr=ADC_SYNC_REG;
   val=12;
   bus_w(addr,val);
@@ -269,7 +268,7 @@ int setDAQRegister()
 #ifdef VERBOSE
   printf("\nADC SYNC reg:%d",reg);
 #endif
-  return result;
+  return OK;
 }
 
 
@@ -1225,7 +1224,9 @@ int initConfGain(int isettings,int val,int imod){
 
 
 int configureMAC(int ipad,long long int macad,long long int servermacad,int ival, int adc){
-	//setting adc mask and DAQ_REG
+	//setting daqregister
+	setDAQRegister(adc);
+	//setting adc mask
 	int reg;
 	int udpPacketSize=0x050E;
 	int ipPacketSize=0x0522;
@@ -1235,7 +1236,6 @@ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival
 	case 2:
 	case 3:
 	case 4:
-		bus_w(DAQ_REG,0x7f2a22);
 		reg = (NCHAN*2)<<CHANNEL_OFFSET;
 		reg&=CHANNEL_MASK;
 		int mask =1<<adc;
@@ -1254,7 +1254,6 @@ int configureMAC(int ipad,long long int macad,long long int servermacad,int ival
 		break;
 	}
 //#ifdef VERBOSE
-	printf("DAQ Reg:%x\n",bus_r(DAQ_REG));
 	printf("Chip of Intrst Reg:%x\n",bus_r(CHIP_OF_INTRST_REG));
 	printf("IP Packet Size:%d\n",ipPacketSize);
 	printf("UDP Packet Size:%d\n",udpPacketSize);
diff --git a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
index 3b13b4630..4aa556abd 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
+++ b/slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.h
@@ -26,7 +26,7 @@ u_int32_t bus_w(u_int32_t offset, u_int32_t data);
 u_int32_t bus_r(u_int32_t offset);
 
 int setPhaseShiftOnce();
-int setDAQRegister();
+int setDAQRegister(int adcval);
 
 u_int32_t putout(char *s, int modnum);
 u_int32_t readin(int modnum);
diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
index ed56ca3e9..0953c5a5d 100755
--- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
+++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
@@ -72,7 +72,7 @@ int init_detector( int b) {
     testRAM();
     //gotthard specific
     //setPhaseShiftOnce();
-    setDAQRegister();
+    setDAQRegister(-1);
     setSettings(GET_SETTINGS,-1);
     //Initialization
     setFrames(1);