1 files changed, 4 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm
index 41d02d2a7..b783a20e6 100644
--- a/perllib/FixMyStreet/App/Model/PhotoSet.pm
+++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm
@@ -265,13 +265,15 @@ sub remove_images {
         --$dec;
     }
 
+    $self->delete_cached();
+
+    return undef if !@images;
+
     my $new_set = (ref $self)->new({
         data_items => \@images,
         object => $self->object,
     });
 
-    $self->delete_cached();
-
     return $new_set->data; # e.g. new comma-separated fileid
 }