diff --git a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java
index 0e6520965f..a4c636af0f 100644
--- a/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java
+++ b/SingularityService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosTaskBuilder.java
@@ -360,7 +360,8 @@ private void prepareCommand(final TaskInfo.Builder bldr, final SingularityTaskId
     if (task.getDeploy().getArguments().isPresent() ||
         // Hopefully temporary workaround for
         // http://www.mail-archive.com/user@mesos.apache.org/msg01449.html
-        task.getDeploy().getContainerInfo().isPresent()) {
+        task.getDeploy().getContainerInfo().isPresent() ||
+        task.getPendingTask().getCmdLineArgsList().isPresent()) {
       commandBldr.setShell(false);
     }