diff --git a/gtk/main.c b/gtk/main.c
index 87c7d5d84..484d430ee 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -546,9 +546,10 @@ exitcheck(gpointer gdata) {
   struct exitdata *data = gdata;
 
   /* keep going if we still have torrents and haven't hit the exit timeout */
-  if(time(NULL) - data->started < TRACKER_EXIT_TIMEOUT &&
-     !tr_backend_torrents_stopped(data->cbdata->back)) {
-    updatemodel(data->cbdata);
+  if( time( NULL ) - data->started < TRACKER_EXIT_TIMEOUT &&
+     ( !tr_backend_torrents_stopped( data->cbdata->back ) ||
+       TR_NAT_TRAVERSAL_DISABLED != natstat ) ) {
+    updatemodel( data->cbdata );
     return TRUE;
   }