diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index d977db5..1f53e53 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -616,6 +616,7 @@
         if( ret == 0 )
         {
             printf("\n\nEOF\n\n");
+            ssl_close_notify( &ssl );
             break;
         }
 
@@ -624,9 +625,9 @@
     }
     while( 1 );
 
-    ssl_close_notify( &ssl );
-
 exit:
+    if( ret == POLARSSL_ERR_SSL_PEER_CLOSE_NOTIFY )
+        ret = 0;
 
 #ifdef POLARSSL_ERROR_C
     if( ret != 0 )