diff --git a/src/macosx/native/sun/awt/CTextPipe.m b/src/macosx/native/sun/awt/CTextPipe.m
index d9bf48afd9285dd8d5f12d746fa37145e7c5c98a..f6510f204ae52a1f947d87c2b21c2ad855cf3f67 100644
--- a/src/macosx/native/sun/awt/CTextPipe.m
+++ b/src/macosx/native/sun/awt/CTextPipe.m
@@ -145,11 +145,6 @@ void JavaCT_DrawGlyphVector
 
     BOOL saved = false;
 
-    /* Save and restore of graphics context is done before the iteration.  
-       This seems to work using our test case (see bug ID 7158350) so we are restoring it at
-       the end of the for loop.  If we find out that save/restore outside the loop
-       doesn't work on all cases then we will move the Save/Restore inside the loop.*/
-    CGContextSaveGState(cgRef);
     CGAffineTransform invTx = CGAffineTransformInvert(strike->fTx);
 
     NSUInteger i;
@@ -226,7 +221,9 @@ void JavaCT_DrawGlyphVector
 
     }
     // reset the font on the context after striking a unicode with CoreText
-    CGContextRestoreGState(cgRef);
+    if (saved) {
+        CGContextRestoreGState(cgRef);
+    }
 }
 
 // Using the Quartz Surface Data context, draw a hot-substituted character run