diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
index cdbb378152..8ad64c74c2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
@@ -29,11 +29,14 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
     public static final String NPM_VERSION = "npmVersion";
     public static final String NPM_REPOSITORY = "npmRepository";
     public static final String SNAPSHOT = "snapshot";
+    public static final String USE_OPAQUE_TOKEN = "useOpaqueToken";
+    public static final String INJECTION_TOKEN = "injectionToken";
     public static final String WITH_INTERFACES = "withInterfaces";
 
     protected String npmName = null;
     protected String npmVersion = "1.0.0";
     protected String npmRepository = null;
+    protected String injectionToken = "InjectionToken<string>";
 
     public TypeScriptAngular2ClientCodegen() {
         super();
@@ -52,6 +55,7 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
         this.cliOptions.add(new CliOption(NPM_VERSION, "The version of your npm package"));
         this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
         this.cliOptions.add(new CliOption(SNAPSHOT, "When setting this property to true the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
+        this.cliOptions.add(new CliOption(USE_OPAQUE_TOKEN, "When setting this property to true, OpaqueToken is used instead of InjectionToken", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
         this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", BooleanProperty.TYPE).defaultValue(Boolean.FALSE.toString()));
     }
 
@@ -88,6 +92,11 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
             addNpmPackageGeneration();
         }
 
+        if(additionalProperties.containsKey(USE_OPAQUE_TOKEN) && Boolean.valueOf(additionalProperties.get(USE_OPAQUE_TOKEN).toString())) {
+            this.setOpaqueToken();
+        }
+        additionalProperties.put(INJECTION_TOKEN, this.injectionToken);
+
         if(additionalProperties.containsKey(WITH_INTERFACES)) {
             boolean withInterfaces = Boolean.parseBoolean(additionalProperties.get(WITH_INTERFACES).toString());
             if (withInterfaces) {
@@ -329,4 +338,7 @@ public class TypeScriptAngular2ClientCodegen extends AbstractTypeScriptClientCod
         return camelize(name);
     }
 
+    public void setOpaqueToken() {
+        this.injectionToken = "OpaqueToken";
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/typescript-angular2/variables.mustache b/modules/swagger-codegen/src/main/resources/typescript-angular2/variables.mustache
index 29b7e5b1d7..d1632d5a27 100644
--- a/modules/swagger-codegen/src/main/resources/typescript-angular2/variables.mustache
+++ b/modules/swagger-codegen/src/main/resources/typescript-angular2/variables.mustache
@@ -1,6 +1,6 @@
-import { OpaqueToken } from '@angular/core';
+import { {{{injectionToken}}} } from '@angular/core';
 
-export const BASE_PATH = new OpaqueToken('basePath');
+export const BASE_PATH = new {{{injectionToken}}}('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',
diff --git a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngular2ClientOptionsProvider.java b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngular2ClientOptionsProvider.java
index fd5961b99b..f7d430c1f4 100644
--- a/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngular2ClientOptionsProvider.java
+++ b/modules/swagger-codegen/src/test/java/io/swagger/codegen/options/TypeScriptAngular2ClientOptionsProvider.java
@@ -36,6 +36,7 @@ public class TypeScriptAngular2ClientOptionsProvider implements OptionsProvider
                 .put(TypeScriptAngular2ClientCodegen.WITH_INTERFACES, Boolean.FALSE.toString())
                 .put(TypeScriptAngular2ClientCodegen.NPM_REPOSITORY, NPM_REPOSITORY)
                 .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
+                .put(TypeScriptAngular2ClientCodegen.USE_OPAQUE_TOKEN, Boolean.FALSE.toString())
                 .build();
     }
 
diff --git a/samples/client/petstore/typescript-angular2/default/variables.ts b/samples/client/petstore/typescript-angular2/default/variables.ts
index 29b7e5b1d7..d06561e7da 100644
--- a/samples/client/petstore/typescript-angular2/default/variables.ts
+++ b/samples/client/petstore/typescript-angular2/default/variables.ts
@@ -1,6 +1,6 @@
-import { OpaqueToken } from '@angular/core';
+import { InjectionToken<string> } from '@angular/core';
 
-export const BASE_PATH = new OpaqueToken('basePath');
+export const BASE_PATH = new InjectionToken<string>('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',
diff --git a/samples/client/petstore/typescript-angular2/npm/variables.ts b/samples/client/petstore/typescript-angular2/npm/variables.ts
index 29b7e5b1d7..d06561e7da 100644
--- a/samples/client/petstore/typescript-angular2/npm/variables.ts
+++ b/samples/client/petstore/typescript-angular2/npm/variables.ts
@@ -1,6 +1,6 @@
-import { OpaqueToken } from '@angular/core';
+import { InjectionToken<string> } from '@angular/core';
 
-export const BASE_PATH = new OpaqueToken('basePath');
+export const BASE_PATH = new InjectionToken<string>('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',
diff --git a/samples/client/petstore/typescript-angular2/with-interfaces/variables.ts b/samples/client/petstore/typescript-angular2/with-interfaces/variables.ts
index 29b7e5b1d7..d06561e7da 100644
--- a/samples/client/petstore/typescript-angular2/with-interfaces/variables.ts
+++ b/samples/client/petstore/typescript-angular2/with-interfaces/variables.ts
@@ -1,6 +1,6 @@
-import { OpaqueToken } from '@angular/core';
+import { InjectionToken<string> } from '@angular/core';
 
-export const BASE_PATH = new OpaqueToken('basePath');
+export const BASE_PATH = new InjectionToken<string>('basePath');
 export const COLLECTION_FORMATS = {
     'csv': ',',
     'tsv': '   ',