diff --git a/commands b/commands
index c14615a..c2f2048 100755
--- a/commands
+++ b/commands
@@ -166,8 +166,9 @@ case "$1" in
     SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
     SERVICE_NAME="$(get_service_name "$SERVICE")"
     PASSWORD="$(cat "$SERVICE_ROOT/PASSWORD")"
+    has_tty && SERVICE_TTY_OPTS="-t"
 
-    docker exec -it "$SERVICE_NAME" mongo -u "$SERVICE" -p "$PASSWORD" --authenticationDatabase "$SERVICE" "$SERVICE"
+    docker exec -i $SERVICE_TTY_OPTS "$SERVICE_NAME" mongo -u "$SERVICE" -p "$PASSWORD" --authenticationDatabase "$SERVICE" "$SERVICE"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:info)
diff --git a/tests/service_connect.bats b/tests/service_connect.bats
index e4dcf69..eb7aa2b 100755
--- a/tests/service_connect.bats
+++ b/tests/service_connect.bats
@@ -25,6 +25,6 @@ teardown() {
   export ECHO_DOCKER_COMMAND="true"
   run dokku "$PLUGIN_COMMAND_PREFIX:connect" l
   password="$(cat "$PLUGIN_DATA_ROOT/l/PASSWORD")"
-  assert_output "docker exec -it dokku.mongo.l mongo -u l -p $password --authenticationDatabase l l"
+  assert_output "docker exec -i -t dokku.mongo.l mongo -u l -p $password --authenticationDatabase l l"
 }