diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index c25a5f0aaf..6c80888f14 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,7 +1,8 @@
 2001-09-21  Angus Leeming  <a.leeming@ic.ac.uk>
 
-	* insetgraphics.C (draw): remove the previous change. Right place is in
-	imageLoaderXPM.C.
+	* insetgraphics.C (draw): remove the previous change. Right place
+	is in imageLoaderXPM.C.
+	(draw): don't display the image if params.display == NONE.
 
 2001-09-18  Angus Leeming  <a.leeming@ic.ac.uk>
 
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 7db9d2a878..72944c62b6 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -291,7 +291,8 @@ void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
 		
 		// Get the image status, default to unknown error.
 		GraphicsCacheItem::ImageStatus status = GraphicsCacheItem::UnknownError;
-		if (cacheHandle.get())
+		if (params.display != InsetGraphicsParams::NONE &&
+		    cacheHandle.get())
 			status = cacheHandle->getImageStatus();
 		
 		// Check if the image is now ready.