diff --git a/CHANGELOG.md b/CHANGELOG.md
index a34306c..090291b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## Dev
 
+## 5.1.6 - 2025-07-09
+
+### Fix
+
+* **client-api**: Fix handling of addFilters and addExclusions calls with empty arg to prevent either function from stalling client-api initialization.
+* **client-api-react**: Fix updating props or using ref functions ocasionally causing repeated function calls.
+
+## 5.1.5 - 2025-06-18
+
 ### Added
 
 * **client-api**: Add `resetFilters` and `resetExclusions` calls, requires minimum Graphistry version 2.42.18
diff --git a/lerna.json b/lerna.json
index 26c8218..ee5616d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "5.1.5",
+  "version": "5.1.6",
   "packages": [
     "projects/client-api",
     "projects/client-api-react",
diff --git a/projects/client-api-react/package-lock.json b/projects/client-api-react/package-lock.json
index 00e2a13..55d3d96 100644
--- a/projects/client-api-react/package-lock.json
+++ b/projects/client-api-react/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "@graphistry/client-api-react",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@graphistry/client-api-react",
-      "version": "5.1.5",
+      "version": "5.1.6",
       "license": "ISC",
       "dependencies": {
-        "@graphistry/client-api": "^5.1.5",
+        "@graphistry/client-api": "^5.1.6",
         "crypto-browserify": "3.12.0",
         "prop-types": ">=15.6.0",
         "shallowequal": "1.1.0",
diff --git a/projects/client-api-react/package.json b/projects/client-api-react/package.json
index f6e7d49..b80d6b5 100644
--- a/projects/client-api-react/package.json
+++ b/projects/client-api-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/client-api-react",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/graphistry/graphistry-js.git"
@@ -69,7 +69,7 @@
   "author": "Graphistry, Inc <https://graphistry.com>",
   "license": "ISC",
   "dependencies": {
-    "@graphistry/client-api": "^5.1.5",
+    "@graphistry/client-api": "^5.1.6",
     "crypto-browserify": "3.12.0",
     "prop-types": ">=15.6.0",
     "shallowequal": "1.1.0",
diff --git a/projects/client-api-react/src/index.js b/projects/client-api-react/src/index.js
index ffd6768..daba18b 100644
--- a/projects/client-api-react/src/index.js
+++ b/projects/client-api-react/src/index.js
@@ -360,24 +360,22 @@ function handleUpdates({ g, isFirstRun, axesMap, props }) {
 }
 
 
-// Regenerate on url change
 function generateIframeRef({
     setLoading, setLoadingMessage, setG, setGSub, setGObs, setGErr, setFirstRun,
-    url, dataset, props,
+    url, props,
     axesMap,
-    iframeStyle, iframeClassName, iframeProps, allowFullScreen,
     tolerateLoadErrors
 }) {
 
-    console.debug('@generateIframeRef', { url, dataset, props, axesMap, iframeStyle, iframeClassName, iframeProps, allowFullScreen, tolerateLoadErrors });
+    console.debug('@generateIframeRef', { url, props, axesMap, tolerateLoadErrors });
 
     return useCallback(iframe => {
-        if (iframe && dataset) {
-            console.debug('@generateIframeRef callback', { iframe, dataset });
+        if (iframe && url) {
+            console.debug('@generateIframeRef callback', { iframe, url });
             let loaded = false;
             setLoading(true);
             setLoadingMessage('Fetching session');
-            console.debug('new iframe', typeof (iframe), { iframe, dataset, propsDataset: props.dataset });
+            console.debug('new iframe', typeof (iframe), { iframe, url, propsDataset: props.dataset });
             const source = graphistryJS(iframe);
             const obs = source.pipe(
                     tap(g => { console.debug('new graphistryJS', g); }),
@@ -442,13 +440,10 @@ function generateIframeRef({
                 setGObs(null);
             }
         } else {
-            console.debug('no iframe', typeof (iframe), { iframe, dataset });
+            console.debug('no iframe', typeof (iframe), { iframe, url });
             return () => { };
         }
-    }, [
-        url,
-        iframeStyle, iframeClassName, iframeProps, allowFullScreen
-    ]);
+    }, [ url ]);
 }
 
 // iframe refreshes on key arg changes: via <iframe key={f(url)}
@@ -596,9 +591,8 @@ const Graphistry = forwardRef((props, ref) => {
     //Initial frame load and settings
     const iframeRef = generateIframeRef({
         setLoading, setLoadingMessage, setG, setGSub, setGObs, setGErr, setFirstRun,
-        url, dataset, props,
+        url, props,
         axesMap,
-        iframeStyle, iframeClassName, iframeProps, allowFullScreen,
         tolerateLoadErrors
     });
 
diff --git a/projects/client-api/package-lock.json b/projects/client-api/package-lock.json
index e81b0c7..682186a 100644
--- a/projects/client-api/package-lock.json
+++ b/projects/client-api/package-lock.json
@@ -1,18 +1,18 @@
 {
   "name": "@graphistry/client-api",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@graphistry/client-api",
-      "version": "5.1.5",
+      "version": "5.1.6",
       "license": "Apache-2.0",
       "dependencies": {
         "@graphistry/falcor-json-graph": "^2.9.10",
         "@graphistry/falcor-model-rxjs": "2.11.0",
         "@graphistry/falcor-socket-datasource": "2.11.3",
-        "@graphistry/js-upload-api": "^5.1.5",
+        "@graphistry/js-upload-api": "^5.1.6",
         "shallowequal": "1.1.0"
       },
       "devDependencies": {
diff --git a/projects/client-api/package.json b/projects/client-api/package.json
index 006f3c9..6dfb93a 100644
--- a/projects/client-api/package.json
+++ b/projects/client-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/client-api",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "description": "Client-side API for interacting with a Graphistry embedded visualization.",
   "jsnext:main": "dist/index.js",
   "config": {
@@ -85,7 +85,7 @@
     "@graphistry/falcor-json-graph": "^2.9.10",
     "@graphistry/falcor-model-rxjs": "2.11.0",
     "@graphistry/falcor-socket-datasource": "2.11.3",
-    "@graphistry/js-upload-api": "^5.1.5",
+    "@graphistry/js-upload-api": "^5.1.6",
     "shallowequal": "1.1.0"
   },
   "peerDependencies": {
diff --git a/projects/client-api/src/index.js b/projects/client-api/src/index.js
index 8574376..4d3129f 100644
--- a/projects/client-api/src/index.js
+++ b/projects/client-api/src/index.js
@@ -1204,8 +1204,15 @@ export function addFilters(expr) {
     }
 
     return switchMap(g => {
-        return forkJoin(expr.map(e => of(g).pipe(addFilter(e))))
-            .pipe(map((results) => g.updateStateWithResult(results)));
+        const observables = expr.length > 0
+            ? expr.map(e => of(g).pipe(addFilter(e)))
+            : [of(null)];
+
+        return forkJoin(observables)
+            .pipe(map((results) => {
+                const finalResults = expr.length > 0 ? results : [];
+                return g.updateStateWithResult(finalResults);
+            }));
     });
 }
 chainList.addFilters = addFilters;
@@ -1262,8 +1269,15 @@ export function addExclusions(expr) {
     }
 
     return switchMap(g => {
-        return forkJoin(expr.map(e => of(g).pipe(addExclusion(e))))
-            .pipe(map((results) => g.updateStateWithResult(results)));
+        const observables = expr.length > 0
+            ? expr.map(e => of(g).pipe(addExclusion(e)))
+            : [of(null)];
+
+        return forkJoin(observables)
+            .pipe(map((results) => {
+                const finalResults = expr.length > 0 ? results : [];
+                return g.updateStateWithResult(finalResults);
+            }));
     });
 }
 chainList.addExclusions = addExclusions;
@@ -1456,16 +1470,18 @@ export function selectionUpdates(g, {withColumns=false, pageSize=1000} = {}) {
         return throwError(() => new Error('selectionUpdates is not available the currently embedded graphistry viz.'));
     }
 
+    const { contentWindow } = g.iFrame;
+
     const selectionPath = ".selection.labels";
     return g.selectionStream || (g.selectionStream = new BehaviorSubject('Initialize selectionUpdates stream')
         .pipe(
             tap(() => {
                 console.debug('postMessage subscription', '@client-api.selectionUpdates');
-                g.iFrame.contentWindow.postMessage({ type: 'graphistry-subscribe', agent: 'graphistryjs', path: selectionPath, options: { pageSize, withColumns } }, '*');
+                contentWindow.postMessage({ type: 'graphistry-subscribe', agent: 'graphistryjs', path: selectionPath, options: { pageSize, withColumns } }, '*');
             }),
             finalize(() => {
                 console.debug('postMessage unsubscribe', '@client-api.selectionUpdates');
-                g.iFrame.contentWindow.postMessage({ type: 'graphistry-unsubscribe', agent: 'graphistryjs', path: selectionPath }, '*');
+                contentWindow.postMessage({ type: 'graphistry-unsubscribe', agent: 'graphistryjs', path: selectionPath }, '*');
             }),
             switchMap(() =>
                 fromEvent(window, 'message').pipe(
@@ -1582,14 +1598,16 @@ export function labelUpdates(g={}) {
                 shareReplay({ bufferSize: 1, refCount: true }),
             );
     } else {
+        const { contentWindow } = g.iFrame;
+
         src = new BehaviorSubject('value').pipe(
-            tap((v) => {
+            tap(() => {
                 console.debug('postMessage subscription', '@client-api.labelUpdates');
-                g.iFrame.contentWindow.postMessage({ type: 'graphistry-subscribe', agent: 'graphistryjs', path: LABELS_PATH }, '*');
+                contentWindow.postMessage({ type: 'graphistry-subscribe', agent: 'graphistryjs', path: LABELS_PATH }, '*');
             }),
             finalize(() => {
                 console.debug('postMessage subscription', '@client-api.labelUpdates');
-                g.iFrame.contentWindow.postMessage({ type: 'graphistry-unsubscribe', agent: 'graphistryjs', path: LABELS_PATH }, '*');
+                contentWindow.postMessage({ type: 'graphistry-unsubscribe', agent: 'graphistryjs', path: LABELS_PATH }, '*');
             }),
             switchMap(() =>
                 fromEvent(window, 'message').pipe(
@@ -1717,16 +1735,18 @@ export function playUpdates(g) {
         return throwError(() => new Error('playUpdates is not available the currently embedded graphistry viz.'));
     }
 
+    const { contentWindow } = g.iFrame;
+
     const selectionPath = ".labels";
     return (new BehaviorSubject('Initialize playUpdates stream')
         .pipe(
             tap(() => {
                 console.debug('postMessage subscription', '@client-api.playUpdate');
-                g.iFrame.contentWindow.postMessage({ type: 'graphistry-subscribe', agent: 'graphistryjs', path: selectionPath }, '*');
+                contentWindow.postMessage({ type: 'graphistry-subscribe', agent: 'graphistryjs', path: selectionPath }, '*');
             }),
             finalize(() => {
                 console.debug('postMessage unsubscribe', '@client-api.playUpdate');
-                g.iFrame.contentWindow.postMessage({ type: 'graphistry-unsubscribe', agent: 'graphistryjs', path: selectionPath }, '*');
+                contentWindow.postMessage({ type: 'graphistry-unsubscribe', agent: 'graphistryjs', path: selectionPath }, '*');
             }),
             switchMap(() =>
                 fromEvent(window, 'message').pipe(
diff --git a/projects/cra-template/package-lock.json b/projects/cra-template/package-lock.json
index 6b0e6b2..501d4a1 100644
--- a/projects/cra-template/package-lock.json
+++ b/projects/cra-template/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@graphistry/cra-template",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@graphistry/cra-template",
-      "version": "5.1.5",
+      "version": "5.1.6",
       "dependencies": {
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/react": "^12.1.5",
diff --git a/projects/cra-template/package.json b/projects/cra-template/package.json
index 1b7e78e..08ce8cc 100644
--- a/projects/cra-template/package.json
+++ b/projects/cra-template/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/cra-template",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "private": true,
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
diff --git a/projects/cra-test-18/package-lock.json b/projects/cra-test-18/package-lock.json
index a048252..d56a4c6 100644
--- a/projects/cra-test-18/package-lock.json
+++ b/projects/cra-test-18/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "test18",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "test18",
-      "version": "5.1.5",
+      "version": "5.1.6",
       "dependencies": {
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/react": "^13.2.0",
diff --git a/projects/cra-test-18/package.json b/projects/cra-test-18/package.json
index 90d35fa..7a47d64 100644
--- a/projects/cra-test-18/package.json
+++ b/projects/cra-test-18/package.json
@@ -1,9 +1,9 @@
 {
   "name": "test18",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "private": true,
   "dependencies": {
-    "@graphistry/client-api-react": "^5.1.5",
+    "@graphistry/client-api-react": "^5.1.6",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.2.0",
     "@testing-library/user-event": "^13.5.0",
diff --git a/projects/cra-test/package-lock.json b/projects/cra-test/package-lock.json
index 5b90a74..f2b3d15 100644
--- a/projects/cra-test/package-lock.json
+++ b/projects/cra-test/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "@graphistry/client-react-app-cra-test",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@graphistry/client-react-app-cra-test",
-      "version": "5.1.5",
+      "version": "5.1.6",
       "dependencies": {
         "@craco/craco": "^6.4.2",
-        "@graphistry/client-api-react": "^5.1.5",
+        "@graphistry/client-api-react": "^5.1.6",
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/react": "^12.1.5",
         "@testing-library/user-event": "^14.2.0",
diff --git a/projects/cra-test/package.json b/projects/cra-test/package.json
index 38cc767..f7f808b 100644
--- a/projects/cra-test/package.json
+++ b/projects/cra-test/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@graphistry/client-react-app-cra-test",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "private": true,
   "dependencies": {
     "@craco/craco": "^6.4.2",
-    "@graphistry/client-api-react": "^5.1.5",
+    "@graphistry/client-api-react": "^5.1.6",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^14.2.0",
diff --git a/projects/js-upload-api/package-lock.json b/projects/js-upload-api/package-lock.json
index 6507ff9..f917af6 100644
--- a/projects/js-upload-api/package-lock.json
+++ b/projects/js-upload-api/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/js-upload-api",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/projects/js-upload-api/package.json b/projects/js-upload-api/package.json
index f7b52a0..a10c8eb 100644
--- a/projects/js-upload-api/package.json
+++ b/projects/js-upload-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/js-upload-api",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/graphistry/graphistry-js.git"
diff --git a/projects/node-api-test-cjs/package-lock.json b/projects/node-api-test-cjs/package-lock.json
index 862e1b7..2bbc8a1 100644
--- a/projects/node-api-test-cjs/package-lock.json
+++ b/projects/node-api-test-cjs/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/node-api-test",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/projects/node-api-test-cjs/package.json b/projects/node-api-test-cjs/package.json
index 05fdfca..9a25eea 100644
--- a/projects/node-api-test-cjs/package.json
+++ b/projects/node-api-test-cjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/node-api-test-cjs",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "description": "",
   "main": "src/index.js",
   "type": "commonjs",
@@ -16,7 +16,7 @@
   "author": "Graphistry, Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@graphistry/node-api": "^5.1.5",
+    "@graphistry/node-api": "^5.1.6",
     "apache-arrow": "^11.0.0"
   }
 }
diff --git a/projects/node-api-test/package-lock.json b/projects/node-api-test/package-lock.json
index 42a19a3..d28f9ea 100644
--- a/projects/node-api-test/package-lock.json
+++ b/projects/node-api-test/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/node-api-test",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/projects/node-api-test/package.json b/projects/node-api-test/package.json
index 2a14288..b4e36b0 100644
--- a/projects/node-api-test/package.json
+++ b/projects/node-api-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/node-api-test",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "description": "",
   "main": "src/index.js",
   "type": "module",
@@ -16,7 +16,7 @@
   "author": "Graphistry, Inc.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@graphistry/node-api": "^5.1.5",
+    "@graphistry/node-api": "^5.1.6",
     "apache-arrow": "^11.0.0"
   }
 }
diff --git a/projects/node-api/package-lock.json b/projects/node-api/package-lock.json
index e5fa946..d23753d 100644
--- a/projects/node-api/package-lock.json
+++ b/projects/node-api/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/node-api",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/projects/node-api/package.json b/projects/node-api/package.json
index 88eb07a..ba31135 100644
--- a/projects/node-api/package.json
+++ b/projects/node-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphistry/node-api",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/graphistry/graphistry-js.git"
@@ -74,7 +74,7 @@
     "typescript": "^4.6.4"
   },
   "dependencies": {
-    "@graphistry/js-upload-api": "^5.1.5",
+    "@graphistry/js-upload-api": "^5.1.6",
     "node-fetch-commonjs": "^3.2.4"
   }
 }