diff --git a/src/components/KymaModules/KymaModulesAddModule.js b/src/components/KymaModules/KymaModulesAddModule.js
index 63e31e588a..ee51a17a9b 100644
--- a/src/components/KymaModules/KymaModulesAddModule.js
+++ b/src/components/KymaModules/KymaModulesAddModule.js
@@ -2,12 +2,16 @@ import { useCallback, useEffect, useState } from 'react';
 import { MessageStrip } from '@ui5/webcomponents-react';
 import { spacing } from '@ui5/webcomponents-react-base';
 import { useTranslation } from 'react-i18next';
-import { useGet } from 'shared/hooks/BackendAPI/useGet';
 import { ResourceForm } from 'shared/ResourceForm';
 import { Spinner } from 'shared/components/Spinner/Spinner';
 import ModulesCard from './ModulesCard';
-import './KymaModulesAddModule.scss';
 import { cloneDeep } from 'lodash';
+import {
+  useModulesReleaseQuery,
+  useModuleTemplatesQuery,
+} from './kymaModulesQueries';
+
+import './KymaModulesAddModule.scss';
 
 export default function KymaModulesAddModule({
   resourceName,
@@ -21,10 +25,6 @@ export default function KymaModulesAddModule({
 }) {
   const { t } = useTranslation();
 
-  const modulesResourceUrl = `/apis/operator.kyma-project.io/v1beta2/moduletemplates`;
-
-  const modulesReleaseMetaResourceUrl = `/apis/operator.kyma-project.io/v1beta2/modulereleasemetas`;
-
   const [resource, setResource] = useState(cloneDeep(kymaResource));
 
   const [selectedModules, setSelectedModules] = useState([]);
@@ -48,13 +48,10 @@ export default function KymaModulesAddModule({
     }
   }, [setKymaResource, kymaResource, selectedModules, activeKymaModules]);
 
-  const { data: modules } = useGet(modulesResourceUrl, {
-    pollingInterval: 3000,
+  const { data: moduleReleaseMetas } = useModulesReleaseQuery({
     skip: !resourceName,
   });
-
-  const { data: moduleReleaseMetas } = useGet(modulesReleaseMetaResourceUrl, {
-    pollingInterval: 3000,
+  const { data: moduleTemplates } = useModuleTemplatesQuery({
     skip: !resourceName,
   });
 
@@ -99,7 +96,7 @@ export default function KymaModulesAddModule({
     );
   }
 
-  const modulesAddData = modules?.items.reduce((acc, module) => {
+  const modulesAddData = moduleTemplates?.items.reduce((acc, module) => {
     const name = module.metadata.labels['operator.kyma-project.io/module-name'];
     const existingModule = acc.find(item => item.name === name);
     const isAlreadyInstalled = initialUnchangedResource?.spec?.modules?.find(
diff --git a/src/components/KymaModules/KymaModulesList.js b/src/components/KymaModules/KymaModulesList.js
index 4b29c24476..c2b73294e0 100644
--- a/src/components/KymaModules/KymaModulesList.js
+++ b/src/components/KymaModules/KymaModulesList.js
@@ -86,11 +86,13 @@ export default function KymaModulesList({
 
   const namespace = 'kyma-system';
 
-  const { data: moduleReleaseMetas } = useModulesReleaseQuery(!resourceName);
+  const { data: moduleReleaseMetas } = useModulesReleaseQuery({
+    skip: !resourceName,
+  });
   const {
     data: moduleTemplates,
     loading: moduleTemplateLoading,
-  } = useModuleTemplatesQuery(!resourceName);
+  } = useModuleTemplatesQuery({ skip: !resourceName });
 
   const crdUrl = `/apis/apiextensions.k8s.io/v1/customresourcedefinitions`;
   const { data: crds } = useGet(crdUrl, {
diff --git a/src/components/KymaModules/kymaModulesQueries.js b/src/components/KymaModules/kymaModulesQueries.js
index 3122ccebb8..fcc644b768 100644
--- a/src/components/KymaModules/kymaModulesQueries.js
+++ b/src/components/KymaModules/kymaModulesQueries.js
@@ -39,7 +39,7 @@ export function useKymaQuery() {
   };
 }
 
-export function useModuleTemplatesQuery(skip = false) {
+export function useModuleTemplatesQuery({ skip = false }) {
   const modulesResourceUrl = `/apis/operator.kyma-project.io/v1beta2/moduletemplates`;
 
   const { data, loading } = useGet(modulesResourceUrl, {
@@ -52,7 +52,7 @@ export function useModuleTemplatesQuery(skip = false) {
   };
 }
 
-export function useModulesReleaseQuery(skip = false) {
+export function useModulesReleaseQuery({ skip = false }) {
   const modulesReleaseMetaResourceUrl = `/apis/operator.kyma-project.io/v1beta2/modulereleasemetas`;
 
   const { data, loading } = useGet(modulesReleaseMetaResourceUrl, {