diff --git a/lib/ssh.py b/lib/ssh.py
index 31fbdbbf69fdf175da4fbd95cb0a1dbf6baa5ad1..4610e2d4f468614dbbc3679a6cb9af1ac47b5d18 100644
--- a/lib/ssh.py
+++ b/lib/ssh.py
@@ -114,10 +114,15 @@ class SshRunner:
       else:
         options.append("-oStrictHostKeyChecking=no")
 
-    elif ask_key:
-      options.extend([
-        "-oStrictHostKeyChecking=ask",
-        ])
+    else:
+      # non-batch mode
+
+      if ask_key:
+        options.append("-oStrictHostKeyChecking=ask")
+      elif strict_host_check:
+        options.append("-oStrictHostKeyChecking=yes")
+      else:
+        options.append("-oStrictHostKeyChecking=no")
 
     return options