diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 3398cc58..81563bb1 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -626,6 +626,10 @@ function install_home_server {
 }
 
 function install_matrix {
+    if [[ $ONION_ONLY != 'no' ]]; then
+        return
+    fi
+
     check_ram_availability 1500
 
     if [ ! -d $INSTALL_DIR ]; then
diff --git a/src/freedombone-app-riot b/src/freedombone-app-riot
index 82b4ee3e..cc8c1817 100755
--- a/src/freedombone-app-riot
+++ b/src/freedombone-app-riot
@@ -207,6 +207,10 @@ function remove_riot {
 }
 
 function install_riot {
+    if [[ $ONION_ONLY != 'no' ]]; then
+        return
+    fi
+
     # check that matrix has been installed
     if [ ! $MATRIX_DOMAIN_NAME ]; then
         exit 687292