diff --git a/modules/services.sh b/modules/services.sh
index 04f57c3f26..1e2b779267 100644
--- a/modules/services.sh
+++ b/modules/services.sh
@@ -12,7 +12,10 @@ function services {
       for file in $SERVICES/*
       do
         if [[ ! $file = *"README.md"* ]]; then
-          echo "${file##*/}" | sed -e 's/^install-//' -e 's/.sh$//'
+          service=$(echo "${file##*/}" | sed -e 's/^install-//' -e 's/.sh$//')
+          if check_arm $service; then
+            echo $service
+          fi
         fi
       done
     else
@@ -85,7 +88,6 @@ function services {
       exit 1
     else
       check_available_services $service_name
-      check_arm $service_name
       case "$command" in
         install)
           checkargn $# 2
@@ -393,11 +395,7 @@ function check_arm {
       return 0
     fi
   done
-  echo "ERROR: unsupported arm"
-  echo "user arm: $(detectarm)"
-  echo "supported arm(s): ${arms[*]}"
-  exit 1
-  # return 1
+  return 1
 }
 
 function check_available_services {
diff --git a/package.json b/package.json
index fdd5003cce..cd23e49fcd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@treehouses/cli",
-  "version": "1.17.20",
+  "version": "1.17.21",
   "remote": "2251",
   "description": "Thin command-line interface for Raspberry Pi low level configuration.",
   "main": "cli.sh",