diff --git a/dockers/docker-fpm-frr/base_image_files/vtysh b/dockers/docker-fpm-frr/base_image_files/vtysh
index 8f8cb2e67960..c479fcd3653b 100755
--- a/dockers/docker-fpm-frr/base_image_files/vtysh
+++ b/dockers/docker-fpm-frr/base_image_files/vtysh
@@ -1,10 +1,3 @@
 #!/bin/bash
 
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS bgp vtysh "$@"
+docker exec -i bgp vtysh "$@"
diff --git a/dockers/docker-fpm-quagga/base_image_files/vtysh b/dockers/docker-fpm-quagga/base_image_files/vtysh
index 8f8cb2e67960..c479fcd3653b 100755
--- a/dockers/docker-fpm-quagga/base_image_files/vtysh
+++ b/dockers/docker-fpm-quagga/base_image_files/vtysh
@@ -1,10 +1,3 @@
 #!/bin/bash
 
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS bgp vtysh "$@"
+docker exec -i bgp vtysh "$@"