diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
index e2813f1b3..ccedbe7f6 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
@@ -3734,13 +3734,9 @@ string multiSlsDetector::setNetworkParameter(networkParameter p, string s){
 	switch (p) {
 	case CLIENT_STREAMING_PORT:
 	case CLIENT_STREAMING_SRC_IP:
-		prev_streaming = enableDataStreamingToClient();
-		if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0);
-		if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0);
-		break;
 	case RECEIVER_STREAMING_PORT:
 	case RECEIVER_STREAMING_SRC_IP:
-		prev_streaming = enableDataStreamingFromReceiver();
+		prev_streaming = (enableDataStreamingFromReceiver() ||  enableDataStreamingToClient());
 		if (enableDataStreamingFromReceiver(-1)) enableDataStreamingFromReceiver(0);
 		if (enableDataStreamingToClient(-1)) enableDataStreamingToClient(0);
 		break;
diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 6ccd8f473..ccaef9638 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -6443,7 +6443,6 @@ string slsDetector::setReceiverStreamingIP(string sourceIP) {
 		}
 		// on success put IP as string into arg
 		else {
-			memset(thisDetector->zmqip, 0, MAX_STR_LENGTH);
 			dataSocket->ConvertInternetAddresstoIpString(result, arg, MAX_STR_LENGTH);
 		}
 	}