diff --git a/src/card/view/CardView.tsx b/src/card/view/CardView.tsx
index 41ffa6986..80e20fa5d 100644
--- a/src/card/view/CardView.tsx
+++ b/src/card/view/CardView.tsx
@@ -48,6 +48,14 @@ const NeoCardView = ({ title, database, query, cypherParameters, globalParameter
         return globalParameters ? globalParameters[key] : undefined;
     }
 
+    const getLocalParameters = (): any => {
+        let re = /(?:^|\W)\$(\w+)(?!\w)/g, match, localQueryVariables : string[] = [];
+        while (match = re.exec(query)) {
+            localQueryVariables.push(match[1]);
+        }
+        return Object.fromEntries(Object.entries(globalParameters).filter(([local]) => localQueryVariables.includes(local) ));
+    }
+
     return (
         <div className={`card-view ${expanded ? "expanded" : ""}`}>
             {reportHeader}
@@ -62,7 +70,7 @@ const NeoCardView = ({ title, database, query, cypherParameters, globalParameter
                         <NeoReport query={query}
                             database={database}
                             stringParameters={cypherParameters}
-                            mapParameters={globalParameters}
+                            mapParameters={getLocalParameters()}
                             disabled={settingsOpen}
                             selection={selection}
                             fields={fields}