diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index b4f1725d7a6..fded6aa3d56 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -177,12 +177,13 @@ def start_rgw(ctx, config):
             run.Raw('2>&1'),
             ]
 
-        run_cmd = teuthology.get_valgrind_args(
-            testdir,
-            client,
-            run_cmd,
-            client_config.get('valgrind')
-            )
+        if client_config.get('valgrind'):
+            run_cmd = teuthology.get_valgrind_args(
+                testdir,
+                client,
+                run_cmd,
+                client_config.get('valgrind')
+                )
 
         run_cmd.extend(run_cmd_tail)