diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 9662f9d..208951f 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -2631,7 +2631,7 @@
       ParsingPreprocessorDirective = false;
 
       // Restore comment saving mode, in case it was disabled for directive.
-      if (!LexingRawMode)
+      if (PP)
         SetCommentRetentionState(PP->getCommentRetentionState());
 
       // Since we consumed a newline, we are back at the start of a line.
diff --git a/test/Preprocessor/comment_save.c b/test/Preprocessor/comment_save.c
index b860042..996c14c 100644
--- a/test/Preprocessor/comment_save.c
+++ b/test/Preprocessor/comment_save.c
@@ -6,3 +6,7 @@
 /* bar */
 // CHECK: /* bar */
 
+#if FOO
+#endif
+/* baz */
+// CHECK: /* baz */