Index: lib/Mail/SpamAssassin/Plugin/TxRep.pm
===================================================================
--- lib/Mail/SpamAssassin/Plugin/TxRep.pm	(revision 1833089)
+++ lib/Mail/SpamAssassin/Plugin/TxRep.pm	(working copy)
@@ -1633,6 +1633,8 @@
   # disabled per bug 7191
   #return 1 unless (!defined $self->{default_storage});
 
+  return 1 if defined ($self->{checker});
+
   my $factory;
   if ($self->{main}->{pers_addr_list_factory}) {
     $factory = $self->{main}->{pers_addr_list_factory};
@@ -1719,6 +1721,7 @@
     $self->{global_storage}->finish();
     $self->{user_storage}   = undef;
     $self->{global_storage} = undef;
+    $self->{default_storage} = $self->{checker} = undef;
   } elsif (defined $self->{default_storage}) {
     $self->{default_storage}->finish();
     $self->{default_storage} = $self->{checker} = undef;
@@ -1812,7 +1815,7 @@
 ###########################################################################
   my ($self) = @_;
 
-  $self->{txKeepStoreTied} = 1;
+  $self->{txKeepStoreTied} = undef;
   return $self;
 }