diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index b740481eb..5f11b1ada 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -744,11 +744,11 @@ sub MoveTo {
   $$self{StorageId} = $$NewStorage{Id};
   $self->Storage($NewStorage);
   $error .= $self->save();
-  if ($error) {
-    $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
-    return $error;
-  }
+
+  # Going to leave it to upper layout as to whether we rollback or not
   $ZoneMinder::Database::dbh->commit() if !$was_in_transaction;
+  return $error if $error;
+
   $self->delete_files($OldStorage);
   return $error;
 } # end sub MoveTo