diff --git a/storybook/pages/CommunitiesViewPage.qml b/storybook/pages/CommunitiesViewPage.qml
index 5d20f851c6..33319ed425 100644
--- a/storybook/pages/CommunitiesViewPage.qml
+++ b/storybook/pages/CommunitiesViewPage.qml
@@ -5,6 +5,7 @@ import StatusQ.Core 0.1
 
 import AppLayouts.Profile.views 1.0
 import AppLayouts.Wallet.stores 1.0
+import AppLayouts.Profile.stores 1.0
 import mainui 1.0
 import utils 1.0
 
@@ -44,7 +45,7 @@ SplitView {
         SplitView.preferredHeight: 400
 
         contentWidth: 664
-        profileSectionStore: QtObject {
+        profileSectionStore: ProfileSectionStore {
             property var communitiesProfileModule: QtObject {
                 function setCommunityMuted(communityId, mutedType) {
                     logs.logEvent("profileSectionStore::communitiesProfileModule::setCommunityMuted", ["communityId", "mutedType"], arguments)
diff --git a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml
index 6ecc09a3ee..bf9b95e2b3 100644
--- a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml
+++ b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml
@@ -19,13 +19,14 @@ import SortFilterProxyModel 0.2
 import "../panels"
 import AppLayouts.Communities.popups 1.0
 import AppLayouts.Communities.panels 1.0
+import AppLayouts.Profile.stores 1.0
 import AppLayouts.Wallet.stores 1.0 as WalletStore
 import AppLayouts.Chat.stores 1.0 as ChatStore
 
 SettingsContentBase {
     id: root
 
-    property var profileSectionStore
+    property ProfileSectionStore profileSectionStore
     property var rootStore
     required property WalletStore.WalletAssetsStore walletAssetsStore
     required property CurrenciesStore currencyStore
diff --git a/ui/imports/shared/stores/CurrenciesStore.qml b/ui/imports/shared/stores/CurrenciesStore.qml
index 878ac7ec37..be5d1ca794 100644
--- a/ui/imports/shared/stores/CurrenciesStore.qml
+++ b/ui/imports/shared/stores/CurrenciesStore.qml
@@ -10,7 +10,7 @@ QtObject {
 
     // Some token+currency-related functions are implemented in the profileSectionModule.
     // We should probably refactor this and move those functions to some Wallet module.
-    property ProfileSectionStore profileSectionStore: ProfileSectionStore {}
+    property var _profileSectionModuleInst: profileSectionModule
 
     function getModelIndexForKey(key) {
         for (var i=0; i<currenciesModel.count; i++) {
@@ -989,17 +989,17 @@ QtObject {
     }
 
     function getFiatValue(cryptoAmount, cryptoSymbol) {
-        var amount = profileSectionStore.profileSectionModuleInst.ensUsernamesModule.getFiatValue(cryptoAmount, cryptoSymbol)
+        var amount = _profileSectionModuleInst.ensUsernamesModule.getFiatValue(cryptoAmount, cryptoSymbol)
         return parseFloat(amount)
     }
 
     function getCryptoValue(fiatAmount, cryptoSymbol) {
-        var amount = profileSectionStore.profileSectionModuleInst.ensUsernamesModule.getCryptoValue(fiatAmount, cryptoSymbol)
+        var amount = _profileSectionModuleInst.ensUsernamesModule.getCryptoValue(fiatAmount, cryptoSymbol)
         return parseFloat(amount)
     }
 
     function getGasEthValue(gweiValue, gasLimit) {
-        var amount = profileSectionStore.profileSectionModuleInst.ensUsernamesModule.getGasEthValue(gweiValue, gasLimit)
+        var amount = _profileSectionModuleInst.ensUsernamesModule.getGasEthValue(gweiValue, gasLimit)
         return parseFloat(amount)
     }