diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6194ee26..2e6c17fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Improvements
 - Snap
     - not showing **License** in the info window if it defined as **unset**
+- Flatpak:
+    - "Remotes not set" warning informing to the user that Flatpak support can be disabled  
 - showing suggestions if the user changes the application types available and there are no applications installed    
 - i18n: spanish contributions by [fitojb](https://github.com/fitojb)
 - minor labels improvements
diff --git a/bauh/gems/flatpak/controller.py b/bauh/gems/flatpak/controller.py
index 0da44b1c..2f6a688b 100644
--- a/bauh/gems/flatpak/controller.py
+++ b/bauh/gems/flatpak/controller.py
@@ -9,7 +9,7 @@ from bauh.api.abstract.disk import DiskCacheLoader
 from bauh.api.abstract.handler import ProcessWatcher
 from bauh.api.abstract.model import PackageHistory, PackageUpdate, SoftwarePackage, PackageSuggestion
 from bauh.api.abstract.view import MessageType
-from bauh.commons.html import strip_html
+from bauh.commons.html import strip_html, bold
 from bauh.commons.system import SystemProcess, ProcessHandler
 from bauh.gems.flatpak import flatpak, suggestions
 from bauh.gems.flatpak.constants import FLATHUB_API_URL
@@ -253,7 +253,8 @@ class FlatpakManager(SoftwareManager):
     def list_warnings(self, internet_available: bool) -> List[str]:
         if flatpak.is_installed():
             if not flatpak.has_remotes_set():
-                return [self.i18n['flatpak.notification.no_remotes']]
+                return [self.i18n['flatpak.notification.no_remotes'],
+                        self.i18n['flatpak.notification.disable'].format(bold('Flatpak'), bold(self.i18n['manage_window.settings.gems']))]
 
     def list_suggestions(self, limit: int) -> List[PackageSuggestion]:
         cli_version = flatpak.get_version()
diff --git a/bauh/gems/flatpak/resources/locale/en b/bauh/gems/flatpak/resources/locale/en
index b538dd9d..b0415238 100644
--- a/bauh/gems/flatpak/resources/locale/en
+++ b/bauh/gems/flatpak/resources/locale/en
@@ -1,5 +1,6 @@
 gem.flatpak.info=Applications available in the repositories configured on your system
 flatpak.notification.no_remotes=No Flatpak remotes set. It will not be possible to search for Flatpak apps.
+flatpak.notification.disable=If you do not want to use Flatpak applications, uncheck {} in {}
 flatpak.downgrade.impossible.title=Error
 flatpak.downgrade.impossible.body=Impossible to downgrade: the app is in its first version
 flatpak.downgrade.commits=Reading package commits
diff --git a/bauh/gems/flatpak/resources/locale/es b/bauh/gems/flatpak/resources/locale/es
index 9840c5a1..9a276d5a 100644
--- a/bauh/gems/flatpak/resources/locale/es
+++ b/bauh/gems/flatpak/resources/locale/es
@@ -19,6 +19,7 @@ flatpak.info.subject=tema
 flatpak.info.type=tipo
 flatpak.info.version=versión
 flatpak.notification.no_remotes=No hay repositorios (remotes) Flatpak configurados. No será posible buscar aplicativos Flatpak.
+flatpak.notification.disable=Si no desea usar aplicativos Flatpak, desmarque {} en {}
 flatpak.downgrade.impossible.title=Error
 flatpak.downgrade.impossible.body=Imposible revertir la versión: el aplicativo está en su primera versión
 flatpak.history.date=fecha
diff --git a/bauh/gems/flatpak/resources/locale/pt b/bauh/gems/flatpak/resources/locale/pt
index c811fe16..986bfdd3 100644
--- a/bauh/gems/flatpak/resources/locale/pt
+++ b/bauh/gems/flatpak/resources/locale/pt
@@ -19,6 +19,7 @@ flatpak.info.subject=assunto
 flatpak.info.type=tipo
 flatpak.info.version=versão
 flatpak.notification.no_remotes=Não há repositórios (remotes) Flatpak configurados. Não será possível buscar aplicativos Flatpak.
+flatpak.notification.disable=Se não deseja usar aplicativos Flatpak, desmarque {} em {}
 flatpak.downgrade.impossible.title=Erro
 flatpak.downgrade.impossible.body=Impossível reverter a versão: o aplicativo está na sua primeira versão
 flatpak.history.date=data