diff --git a/libretroshare/src/retroshare/rsgxsifacehelper.h b/libretroshare/src/retroshare/rsgxsifacehelper.h
index 33015e1f0..65cd356ed 100644
--- a/libretroshare/src/retroshare/rsgxsifacehelper.h
+++ b/libretroshare/src/retroshare/rsgxsifacehelper.h
@@ -358,6 +358,9 @@ public:
                 mTokenService.cancelRequest(it->first);
                 it = mActiveTokens.erase(it);
 			}
+        	else
+                ++it;
+
         return true;
     }