diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
index 0f982c3ff0..4c03bb1847 100644
--- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
+++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
@@ -2741,7 +2741,7 @@ public class RestClient implements Closeable {
         addPageLinkToParam(params, pageLink);
         addTenantOnlyAndFullSearchToParams(tenantOnly, fullSearch, params);
         return restTemplate.exchange(
-                baseURL + "/api/widgetsBundles?" + getUrlParams(pageLink) + getWidgetsBundlePageRequestUrlParams(tenantOnly, fullSearch),
+                baseURL + "/api/widgetsBundles?" + getUrlParams(pageLink) + getTenantOnlyAndFullSearchUrlParams(tenantOnly, fullSearch),
                 HttpMethod.GET,
                 HttpEntity.EMPTY,
                 new ParameterizedTypeReference<PageData<WidgetsBundle>>() {
@@ -3776,27 +3776,10 @@ public class RestClient implements Closeable {
         return urlParams;
     }
 
-    private String getWidgetsBundlePageRequestUrlParams(Boolean tenantOnly, Boolean fullSearch) {
-        String urlParams = "";
-        if (tenantOnly != null) {
-            urlParams = "&tenantOnly={tenantOnly}";
-        }
-        if (fullSearch != null) {
-            urlParams += "&fullSearch={fullSearch}";
-        }
-        return urlParams;
-    }
-
     private String getWidgetTypeInfoPageRequestUrlParams(Boolean tenantOnly, Boolean fullSearch,
                                                          DeprecatedFilter deprecatedFilter,
                                                          List<String> widgetTypeList) {
-        String urlParams = "";
-        if (tenantOnly != null) {
-            urlParams = "&tenantOnly={tenantOnly}";
-        }
-        if (fullSearch != null) {
-            urlParams += "&fullSearch={fullSearch}";
-        }
+        String urlParams = getTenantOnlyAndFullSearchUrlParams(tenantOnly, fullSearch);
         if (deprecatedFilter != null) {
             urlParams += "&deprecatedFilter={deprecatedFilter}";
         }
@@ -3806,6 +3789,17 @@ public class RestClient implements Closeable {
         return urlParams;
     }
 
+    private String getTenantOnlyAndFullSearchUrlParams(Boolean tenantOnly, Boolean fullSearch) {
+        String urlParams = "";
+        if (tenantOnly != null) {
+            urlParams = "&tenantOnly={tenantOnly}";
+        }
+        if (fullSearch != null) {
+            urlParams += "&fullSearch={fullSearch}";
+        }
+        return urlParams;
+    }
+
     private void addTimePageLinkToParam(Map<String, String> params, TimePageLink pageLink) {
         this.addPageLinkToParam(params, pageLink);
         if (pageLink.getStartTime() != null) {