diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
index 7ec4d653102..4cc027bb63f 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
@@ -334,6 +334,11 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                         var.defaultValue = var.datatypeWithEnum + "." + enumName;
                     }
                 }
+
+                // HACK: strip ? from enum
+                if (var.datatypeWithEnum != null) {
+                    var.vendorExtensions.put("plainDatatypeWithEnum", var.datatypeWithEnum.substring(0, var.datatypeWithEnum.length() - 1));
+                }
             }
         }
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
index 38b67c3c40d..3a2a93cd109 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
@@ -1,4 +1,4 @@
-public enum {{datatypeWithEnum}} {
+public enum {{vendorExtensions.plainDatatypeWithEnum}} {
             {{#allowableValues}}{{#enumVars}}
             [EnumMember(Value = "{{jsonname}}")]
             {{name}}{{^-last}},