diff --git a/packages/x-components/src/x-modules/history-queries/components/clear-history-queries.vue b/packages/x-components/src/x-modules/history-queries/components/clear-history-queries.vue
index e49cc6d3a4..b30d3b6a6a 100644
--- a/packages/x-components/src/x-modules/history-queries/components/clear-history-queries.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/clear-history-queries.vue
@@ -18,7 +18,6 @@
   import { VueCSSClasses } from '../../../utils/types';
   import { XEventsTypes } from '../../../wiring/events.types';
   import { historyQueriesXModule } from '../x-module';
-  import { useRegisterXModule } from '../../../composables/use-register-x-module';
   import { useState } from '../../../composables/use-state';
 
   /**
@@ -35,8 +34,6 @@
       BaseEventButton
     },
     setup() {
-      useRegisterXModule(historyQueriesXModule);
-
       /**
        * The whole history queries.
        *
diff --git a/packages/x-components/src/x-modules/history-queries/components/history-queries-switch.vue b/packages/x-components/src/x-modules/history-queries/components/history-queries-switch.vue
index d7d0467847..44026e2fc9 100644
--- a/packages/x-components/src/x-modules/history-queries/components/history-queries-switch.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/history-queries-switch.vue
@@ -9,7 +9,6 @@
   import { historyQueriesXModule } from '../x-module';
   import { isArrayEmpty } from '../../../utils/array';
   import { use$x } from '../../../composables/use-$x';
-  import { useRegisterXModule } from '../../../composables/use-register-x-module';
   import { useState } from '../../../composables/use-state';
 
   /**
@@ -25,8 +24,6 @@
       BaseSwitch
     },
     setup() {
-      useRegisterXModule(historyQueriesXModule);
-
       const $x = use$x();
 
       /**
diff --git a/packages/x-components/src/x-modules/history-queries/components/history-queries.vue b/packages/x-components/src/x-modules/history-queries/components/history-queries.vue
index 05005d34dd..1243fc01f6 100644
--- a/packages/x-components/src/x-modules/history-queries/components/history-queries.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/history-queries.vue
@@ -50,7 +50,6 @@
   import { defineComponent } from 'vue';
   import BaseSuggestions from '../../../components/suggestions/base-suggestions.vue';
   import { historyQueriesXModule } from '../x-module';
-  import { useRegisterXModule } from '../../../composables/use-register-x-module';
   import { useGetter } from '../../../composables/use-getter';
   import HistoryQuery from './history-query.vue';
 
@@ -70,8 +69,6 @@
     },
     inheritAttrs: false,
     setup() {
-      useRegisterXModule(historyQueriesXModule);
-
       /**
        * The filtered list of history queries.
        *
diff --git a/packages/x-components/src/x-modules/history-queries/components/history-query.vue b/packages/x-components/src/x-modules/history-queries/components/history-query.vue
index 2c7921b76a..e3450665c0 100644
--- a/packages/x-components/src/x-modules/history-queries/components/history-query.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/history-query.vue
@@ -45,7 +45,6 @@
   import { XEventsTypes } from '../../../wiring/events.types';
   import { historyQueriesXModule } from '../x-module';
   import { useGetter } from '../../../composables/use-getter';
-  import { useRegisterXModule } from '../../../composables/use-register-x-module';
   import RemoveHistoryQuery from './remove-history-query.vue';
 
   /**
@@ -76,8 +75,6 @@
     },
     emits: ['click'],
     setup(props) {
-      useRegisterXModule(historyQueriesXModule);
-
       /**
        * The normalized query of the history-queries module.
        *
diff --git a/packages/x-components/src/x-modules/history-queries/components/my-history.vue b/packages/x-components/src/x-modules/history-queries/components/my-history.vue
index a1372aabc6..c789d4a3bd 100644
--- a/packages/x-components/src/x-modules/history-queries/components/my-history.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/my-history.vue
@@ -66,7 +66,6 @@
   import { historyQueriesXModule } from '../x-module';
   import { AnimationProp } from '../../../types/index';
   import { useState } from '../../../composables/use-state';
-  import { useRegisterXModule } from '../../../composables/use-register-x-module';
   import HistoryQuery from './history-query.vue';
 
   /**
@@ -110,8 +109,6 @@
       queriesListClass: String
     },
     setup(props) {
-      useRegisterXModule(historyQueriesXModule);
-
       /**
        * The list of history queries.
        *
diff --git a/packages/x-components/src/x-modules/history-queries/components/remove-history-query.vue b/packages/x-components/src/x-modules/history-queries/components/remove-history-query.vue
index dc9522804f..54b15f8add 100644
--- a/packages/x-components/src/x-modules/history-queries/components/remove-history-query.vue
+++ b/packages/x-components/src/x-modules/history-queries/components/remove-history-query.vue
@@ -15,7 +15,6 @@
   import BaseEventButton from '../../../components/base-event-button.vue';
   import { XEventsTypes } from '../../../wiring/events.types';
   import { historyQueriesXModule } from '../x-module';
-  import { useRegisterXModule } from '../../../composables/use-register-x-module';
 
   /**
    * Button that when it is pressed emits the
@@ -42,8 +41,6 @@
       }
     },
     setup(props) {
-      useRegisterXModule(historyQueriesXModule);
-
       /**
        * The event handler that will be triggered when clicking on the clear history query button.
        *
diff --git a/packages/x-components/src/x-modules/history-queries/x-module.ts b/packages/x-components/src/x-modules/history-queries/x-module.ts
index 76e8a50e83..6d5b90e982 100644
--- a/packages/x-components/src/x-modules/history-queries/x-module.ts
+++ b/packages/x-components/src/x-modules/history-queries/x-module.ts
@@ -1,3 +1,4 @@
+import { XPlugin } from '../../plugins/x-plugin';
 import { XModule } from '../x-modules.types';
 import { historyQueriesEmitters } from './store/emitters';
 import { historyQueriesXStoreModule } from './store/module';
@@ -23,3 +24,5 @@ export const historyQueriesXModule: HistoryQueriesXModule = {
   storeEmitters: historyQueriesEmitters,
   wiring: historyQueriesWiring
 };
+
+XPlugin.registerXModule(historyQueriesXModule);