Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(revision 16239)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java	(working copy)
@@ -689,7 +689,9 @@
     public void setImage(ImageEntry entry) {
         synchronized (this) {
             this.entry = entry;
-            image = null;
+            if (entry == null) {
+                image = null;
+            }
             errorLoading = false;
         }
         repaint();