diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc
index 0c1f80e5e..48778064f 100644
--- a/libretroshare/src/gxs/rsgenexchange.cc
+++ b/libretroshare/src/gxs/rsgenexchange.cc
@@ -2247,6 +2247,9 @@ void RsGenExchange::processRecvdMessages()
     	}
     }
 
+    if(mReceivedMsgs.empty())
+        return;
+
     std::vector<RsNxsMsg*>::iterator vit = mReceivedMsgs.begin();
     GxsMsgReq msgIds;
     std::map<RsNxsMsg*, RsGxsMsgMetaData*> msgs;
@@ -2370,6 +2373,9 @@ void RsGenExchange::processRecvdGroups()
 {
     RsStackMutex stack(mGenMtx);
 
+    if(mReceivedGrps.empty())
+        return;
+
     NxsGrpPendValidVect::iterator vit = mReceivedGrps.begin();
     std::vector<std::string> existingGrpIds;
     std::list<std::string> grpIds;
diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc
index 6a31a0c27..a15336600 100644
--- a/libretroshare/src/gxs/rsgxsnetservice.cc
+++ b/libretroshare/src/gxs/rsgxsnetservice.cc
@@ -872,7 +872,7 @@ bool RsGxsNetService::locked_processTransac(RsNxsTransac* item)
 void RsGxsNetService::run(){
 
 
-    double timeDelta = 0.2;
+    double timeDelta = 0.5;
     int updateCounter = 0;
 
     while(isRunning()){
@@ -883,7 +883,7 @@ void RsGxsNetService::run(){
         Sleep((int) (timeDelta * 1000));
 #endif
 
-        if(updateCounter == 3)
+        if(updateCounter == 20)
         {
         	updateServerSyncTS();
         	updateCounter = 0;