diff --git a/lexers/embedded/c#.xml b/lexers/embedded/c#.xml
index 801a9543b..f1e21db03 100644
--- a/lexers/embedded/c#.xml
+++ b/lexers/embedded/c#.xml
@@ -19,10 +19,10 @@
       <rule pattern="\\\n">
         <token type="Text"/>
       </rule>
-      <rule pattern="///[^\n\r]+">
+      <rule pattern="///[^\n\r]*">
         <token type="CommentSpecial"/>
       </rule>
-      <rule pattern="//[^\n\r]+">
+      <rule pattern="//[^\n\r]*">
         <token type="CommentSingle"/>
       </rule>
       <rule pattern="/[*].*?[*]/">
diff --git a/lexers/testdata/csharp/csharp_comment_single.actual b/lexers/testdata/csharp/csharp_comment_single.actual
index 02fdc16a6..3a1ea8725 100644
--- a/lexers/testdata/csharp/csharp_comment_single.actual
+++ b/lexers/testdata/csharp/csharp_comment_single.actual
@@ -1,2 +1,3 @@
 // TODO: Maybe later
-// TODO: Implement more features
\ No newline at end of file
+// TODO: Implement more features
+//
\ No newline at end of file
diff --git a/lexers/testdata/csharp/csharp_comment_single.expected b/lexers/testdata/csharp/csharp_comment_single.expected
index 4e03b47ad..3e1acd88e 100644
--- a/lexers/testdata/csharp/csharp_comment_single.expected
+++ b/lexers/testdata/csharp/csharp_comment_single.expected
@@ -1,5 +1,7 @@
 [
   {"type":"CommentSingle","value":"// TODO: Maybe later"},
   {"type":"Text","value":"\n"},
-  {"type":"CommentSingle","value":"// TODO: Implement more features"}
+  {"type":"CommentSingle","value":"// TODO: Implement more features"},
+  {"type":"Text","value":"\n"},
+  {"type":"CommentSingle","value":"//"}
 ]
diff --git a/lexers/testdata/csharp/csharp_comment_summary.actual b/lexers/testdata/csharp/csharp_comment_summary.actual
index 9bdd253ab..7929cb928 100644
--- a/lexers/testdata/csharp/csharp_comment_summary.actual
+++ b/lexers/testdata/csharp/csharp_comment_summary.actual
@@ -1,3 +1,4 @@
 /// <summary>
 /// Class <c>Point</c> models a point in a two-dimensional plane.
+///
 /// </summary>
\ No newline at end of file
diff --git a/lexers/testdata/csharp/csharp_comment_summary.expected b/lexers/testdata/csharp/csharp_comment_summary.expected
index aec8a1e8f..c231deffa 100644
--- a/lexers/testdata/csharp/csharp_comment_summary.expected
+++ b/lexers/testdata/csharp/csharp_comment_summary.expected
@@ -3,5 +3,7 @@
   {"type":"Text","value":"\n"},
   {"type":"CommentSpecial","value":"/// Class \u003cc\u003ePoint\u003c/c\u003e models a point in a two-dimensional plane."},
   {"type":"Text","value":"\n"},
+  {"type":"CommentSpecial","value":"///"},
+  {"type":"Text","value":"\n"},
   {"type":"CommentSpecial","value":"/// \u003c/summary\u003e"}
 ]