diff --git a/packages/apollo/src/Command.ts b/packages/apollo/src/Command.ts
index f2e8b90dc6..b9d7ea527f 100644
--- a/packages/apollo/src/Command.ts
+++ b/packages/apollo/src/Command.ts
@@ -59,8 +59,10 @@ export abstract class ProjectCommand extends Command {
     header: flags.string({
       multiple: true,
       parse: header => {
-        const [key, value] = header.split(":");
-        return JSON.stringify({ [key.trim()]: value.trim() });
+        const separatorIndex = header.indexOf(":");
+        const key = header.substring(0, separatorIndex).trim();
+        const value = header.substring(separatorIndex + 1).trim();
+        return JSON.stringify({ [key]: value });
       },
       description: "Additional headers to send to server for introspectionQuery"
     }),
@@ -264,7 +266,7 @@ export abstract class ClientCommand extends ProjectCommand {
       if (flags.endpoint) {
         config.client.service = {
           url: flags.endpoint,
-          headers: headersArrayToObject(flags.headers)
+          headers: headersArrayToObject(flags.header)
         };
       }