diff --git a/cli/transmissioncli.c b/cli/transmissioncli.c
index e47464cbc..6093a756e 100644
--- a/cli/transmissioncli.c
+++ b/cli/transmissioncli.c
@@ -247,6 +247,7 @@ int main( int argc, char ** argv )
         {
             gotsig = 0;
             tr_torrentStop( tor );
+            tr_natTraversalEnable( h, 0 );
         }
 
         s = tr_torrentStat( tor );
@@ -282,6 +283,10 @@ int main( int argc, char ** argv )
         {
             chars = snprintf( string, sizeof string, "Stopping..." );
         }
+        else if( s->status & TR_STATUS_INACTIVE )
+        {
+            break;
+        }
         if( ( signed )sizeof string > chars )
         {
             memset( &string[chars], ' ', sizeof string - 1 - chars );