diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
index 9362dd6..5095fc8 100644
--- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
+++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
@@ -128,7 +128,12 @@ NSString * const KeyActionTypeOpen = @"openPage";
         }];
     };
 
-    [self setClientParameterWith:actionInformation completionHandler:performAction];
+    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    if ([actionInformation dict:@"clientParameters"]) {
+        [self setClientParameterWith:actionInformation completionHandler:performAction];
+    } else {
+        performAction(actionInformation);
+    }
 }
 
 - (void)shareAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
@@ -293,7 +298,12 @@ NSString * const KeyActionTypeOpen = @"openPage";
         [weakSelf prepareLinkAwayWithURL:otherURL appURL:appURL actionInformation:actionMap additionalData:additionalData delegateObject:delegateObject];
     };
 
-    [self setClientParameterWith:actionInformation completionHandler:performAction];
+    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    if ([actionInformation dict:@"clientParameters"]) {
+        [self setClientParameterWith:actionInformation completionHandler:performAction];
+    } else {
+        performAction(actionInformation);
+    }
 }
 
 - (void)prepareLinkAwayWithURL:(nullable NSURL *)url appURL:(nullable NSURL *)appURL actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
@@ -443,7 +453,12 @@ NSString * const KeyActionTypeOpen = @"openPage";
         }];
     };
 
-    [self setClientParameterWith:actionInformation completionHandler:performAction];
+    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    if ([actionInformation dict:@"clientParameters"]) {
+        [self setClientParameterWith:actionInformation completionHandler:performAction];
+    } else {
+        performAction(actionInformation);
+    }
 }
 
 - (void)restartAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
@@ -562,7 +577,12 @@ NSString * const KeyActionTypeOpen = @"openPage";
         [weakSelf prepareLinkAwayWithURL:otherURL appURL:appURL actionInformation:actionMap additionalData:additionalData delegate:delegate];
     };
 
-    [self setClientParameterWith:actionInformation completionHandler:performAction];
+    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    if ([actionInformation dict:@"clientParameters"]) {
+        [self setClientParameterWith:actionInformation completionHandler:performAction];
+    } else {
+        performAction(actionInformation);
+    }
 }
 
 - (void)prepareLinkAwayWithURL:(nullable NSURL *)url appURL:(nullable NSURL *)appURL actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {