diff --git a/doc/cli.markdown b/doc/cli.markdown
index eea84411..09efba6e 100644
--- a/doc/cli.markdown
+++ b/doc/cli.markdown
@@ -975,6 +975,7 @@ Examples:
 	$ balena ssh 7cf02a6 --port 8080
 	$ balena ssh 7cf02a6 -v
 	$ balena ssh 7cf02a6 -s
+	$ balena ssh 7cf02a6 --noninteractive
 
 ### Options
 
@@ -994,6 +995,10 @@ access host OS (for devices with balenaOS >= 2.0.0+rev1)
 
 don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally.
 
+#### --noninteractive
+
+run command non-interactively, do not automatically suggest devices to connect to if UUID not found
+
 # Notes
 
 ## note <|note>
diff --git a/lib/actions/ssh.coffee b/lib/actions/ssh.coffee
index 0074f198..3ea802d4 100644
--- a/lib/actions/ssh.coffee
+++ b/lib/actions/ssh.coffee
@@ -35,6 +35,7 @@ module.exports =
 			$ balena ssh 7cf02a6 --port 8080
 			$ balena ssh 7cf02a6 -v
 			$ balena ssh 7cf02a6 -s
+			$ balena ssh 7cf02a6 --noninteractive
 	'''
 	permission: 'user'
 	primary: true
@@ -53,6 +54,10 @@ module.exports =
 			boolean: true
 			description: "don't use the proxy configuration for this connection.
 				Only makes sense if you've configured proxy globally."
+	,
+			signature: 'noninteractive'
+			boolean: true
+			description: 'run command non-interactively, do not automatically suggest devices to connect to if UUID not found'
 	]
 	action: (params, options, done) ->
 		normalizeUuidProp(params)
@@ -103,6 +108,9 @@ module.exports =
 			return balena.models.device.has(params.uuid)
 		.then (uuidExists) ->
 			return params.uuid if uuidExists
+			if options.noninteractive
+				console.error("Could not find device: #{params.uuid}")
+				process.exit(1)
 			return patterns.inferOrSelectDevice()
 		.then (uuid) ->
 			console.info("Connecting to: #{uuid}")