diff --git a/README.md b/README.md
index 9d17a675..226364d3 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,6 @@ Each MyNode device comes with a number of wonderful features.
 - Electrum Server
 - BTCPay Server
 - RTL (Ride the Lightning) - Lightning Wallet
-- Samourai Dojo
-- Samourai Whirlpool
 - Specter Desktop
 - Thunderhub
 - BTC RPC Explorer
diff --git a/rootfs/standard/usr/share/mynode/application_info.json b/rootfs/standard/usr/share/mynode/application_info.json
index 8b9f519e..da3b2902 100644
--- a/rootfs/standard/usr/share/mynode/application_info.json
+++ b/rootfs/standard/usr/share/mynode/application_info.json
@@ -234,6 +234,7 @@
         "app_tile_button_href": "/dojo",
         "app_tile_running_status_text": "Running",
         "can_uninstall": true,
+        "show_on_marketplace_page": false,
         "show_on_application_page": true,
         "show_on_homepage": true,
         "requires_electrs": true,
@@ -259,6 +260,7 @@
         "app_tile_button_href": "/whirlpool",
         "app_tile_running_status_text": "Running",
         "can_uninstall": true,
+        "show_on_marketplace_page": false,
         "show_on_homepage": true,
         "homepage_order": 23
     },
diff --git a/rootfs/standard/var/pynode/application_info.py b/rootfs/standard/var/pynode/application_info.py
index 2a4f0dae..5f177e10 100644
--- a/rootfs/standard/var/pynode/application_info.py
+++ b/rootfs/standard/var/pynode/application_info.py
@@ -212,6 +212,7 @@ def initialize_application_defaults(app):
     if not "supports_testnet" in app: app["supports_testnet"] = False
     if not "show_on_homepage" in app: app["show_on_homepage"] = False
     if not "show_on_application_page" in app: app["show_on_application_page"] = True
+    if not "show_on_marketplace_page" in app: app["show_on_marketplace_page"] = app["show_on_application_page"]
     if not "show_on_status_page" in app: app["show_on_status_page"] = False             # New apps should set to true
     if not "can_enable_disable" in app: app["can_enable_disable"] = True
     if not "is_enabled" in app: app["is_enabled"] = is_service_enabled( app["short_name"] )
diff --git a/rootfs/standard/var/www/mynode/settings.py b/rootfs/standard/var/www/mynode/settings.py
index 5c495de5..1ce56126 100644
--- a/rootfs/standard/var/www/mynode/settings.py
+++ b/rootfs/standard/var/www/mynode/settings.py
@@ -270,9 +270,11 @@ def page_status():
         "joinmarket_api_status": get_service_status_basic_text("joinmarket-api"),
         "joinmarket_api_status_color": get_service_status_color("joinmarket-api"),
         #"whirlpool_status_log": get_journalctl_log("whirlpool"),
+        "whirlpool_installed": is_installed("whirlpool"),
         "whirlpool_status": get_service_status_basic_text("whirlpool"),
         "whirlpool_status_color": get_service_status_color("whirlpool"),
         #"dojo_status_log": get_journalctl_log("dojo"),
+        "dojo_installed": is_installed("dojo"),
         "dojo_status": get_service_status_basic_text("dojo"),
         "dojo_status_color": get_service_status_color("dojo"),
         #"btcpayserver_status_log": get_journalctl_log("btcpayserver"),
diff --git a/rootfs/standard/var/www/mynode/templates/marketplace.html b/rootfs/standard/var/www/mynode/templates/marketplace.html
index a11a8bf4..504804c4 100644
--- a/rootfs/standard/var/www/mynode/templates/marketplace.html
+++ b/rootfs/standard/var/www/mynode/templates/marketplace.html
@@ -43,7 +43,7 @@
 
                 <div class="marketplace_category_container">
                     {% for app in apps %}
-                        {% if app.show_on_application_page and app.category == category.name %}
+                        {% if app.show_on_marketplace_page and app.category == category.name %}
                             <div class="marketplace_app_tile" data-shortname="{{app.short_name}}">
                                 <div class="marketplace_app_tile_left">
                                     <img class="marketplace_app_tile_icon" src="{{ url_for('static', filename="images/app_icons/")}}{{app.short_name}}.png"/>
diff --git a/rootfs/standard/var/www/mynode/templates/status.html b/rootfs/standard/var/www/mynode/templates/status.html
index bd82bf7c..0804a83d 100644
--- a/rootfs/standard/var/www/mynode/templates/status.html
+++ b/rootfs/standard/var/www/mynode/templates/status.html
@@ -240,6 +240,7 @@
             <div class="divider"></div>
             {% endif %}
 
+            {% if whirlpool_installed %}
             <div class="settings_block_subheader">Whirlpool Status</div>
             <div class="settings_block_subheader_status">
                 <div class="settings_block_subheader_status_icon {{ whirlpool_status_color }}"></div>
@@ -248,7 +249,9 @@
             <button id="show_whirlpool_log" onclick="showLog('whirlpool')" class="ui-button ui-widget ui-corner-all settings_button_small">Show Log</button>
             <div id="whirlpool_log" style='text-align: left; font-size: 12px; width: 800px; display: none;'><pre>{{whirlpool_status_log}}</pre></div>
             <div class="divider"></div>
+            {% endif %}
 
+            {% if dojo_installed %}
             <div class="settings_block_subheader">Dojo Status</div>
             <div class="settings_block_subheader_status">
                 <div class="settings_block_subheader_status_icon {{ dojo_status_color }}"></div>
@@ -264,6 +267,7 @@
             <button id="show_dojo_log" onclick="showLog('dojo')" class="ui-button ui-widget ui-corner-all settings_button_small">Show Log</button>
             <div id="dojo_log" style='text-align: left; font-size: 12px; width: 800px; display: none;'><pre>{{dojo_status_log}}</pre></div>
             <div class="divider"></div>
+            {% endif %}
 
             <div class="settings_block_subheader">BTCPay Server Status</div>
             <div class="settings_block_subheader_status">