diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew
index e9ded63e4..e6a534e7f 100755
Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_jungfraunew differ
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
index 650450dc7..fd3282b6c 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
+++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c
@@ -406,6 +406,8 @@ void setupDetector() {
 	setTimer(ACQUISITION_TIME, DEFAULT_EXPTIME);
 	setTimer(FRAME_PERIOD, DEFAULT_PERIOD);
 	setTimer(DELAY_AFTER_TRIGGER, DEFAULT_DELAY);
+	setTimer(STORAGE_CELL_NUMBER, DEFAULT_NUM_STRG_CLLS);
+	selectStoragecellStart(DEFAULT_STRG_CLL_STRT);
 	/*setSpeed(CLOCK_DIVIDER, HALF_SPEED); depends if all the previous stuff works*/
 	setTiming(DEFAULT_TIMING_MODE);
 	setHighVoltage(DEFAULT_HIGH_VOLTAGE);
diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
index b7c292fc1..bdc3b2f46 100644
--- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
+++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorServer_defs.h
@@ -71,6 +71,8 @@ enum NETWORKINDEX           { TXN_FRAME };
 #define DEFAULT_SETTINGS			(DYNAMICGAIN)
 #define DEFAULT_TX_UDP_PORT			(0x7e9a)
 #define DEFAULT_TMP_THRSHLD         (65*1000) //milli degree Celsius
+#define DEFAULT_NUM_STRG_CLLS       (0)
+#define DEFAULT_STRG_CLL_STRT       (0xf)
 
 /* Defines in the Firmware */
 #define FIX_PATT_VAL    			(0xACDC2014)
diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
index 22a28c514..b7b319a8e 100755
--- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
+++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
@@ -5607,7 +5607,11 @@ int storage_cell_start(int file_des) {
         cprintf(RED, "Warning: %s", mess);
     }
 #ifdef SLS_DETECTOR_FUNCTION_LIST
-    else {
+    else if (arg > MAX_STORAGE_CELL_VAL) {
+        ret=FAIL;
+        strcpy(mess,"Max Storage cell number should not exceed 15\n");
+        cprintf(RED, "Warning: %s", mess);
+    } else {
 #ifdef VERBOSE
     printf("Storage cell start to %d\n", arg);
 #endif