diff --git a/lenses/json.aug b/lenses/json.aug
index 119fe6f77..e5136abfa 100644
--- a/lenses/json.aug
+++ b/lenses/json.aug
@@ -18,6 +18,7 @@ let eol = del spc "\n"
 let delim (c:string) (d:string) = del (c . spc) d
 let dels (s:string) = del s s
 let comment = Util.comment_generic /\/\/[ \t]*/ "// " . del spc ""
+            | [ del /\/\/[ \t\n]*\n/ "//\n" ]
 
 let comma = delim "," "," . comment?
 let colon = delim ":" ":"
diff --git a/lenses/tests/test_json.aug b/lenses/tests/test_json.aug
index 075e386ed..caaff2780 100644
--- a/lenses/tests/test_json.aug
+++ b/lenses/tests/test_json.aug
@@ -331,12 +331,16 @@ test lns get t =
 
 (* Comments *)
 test lns get "// A comment
+//
 {\"menu\": 1 }
+//
 // Another comment\n" =
   { "#comment" = "A comment" }
+  { }
   { "dict"
     { "entry" = "menu"
       { "number" = "1" } } }
+  { }
   { "#comment" = "Another comment" }