diff --git a/packages/cli/lib/serverlessLogs.js b/packages/cli/lib/serverlessLogs.js
index cd182c745..1e25fd768 100644
--- a/packages/cli/lib/serverlessLogs.js
+++ b/packages/cli/lib/serverlessLogs.js
@@ -54,6 +54,7 @@ const tailLogs = async ({
       latestLog = await tailCall(after);
       nextAfter = latestLog.paging.next.after;
     } catch (e) {
+      logger.info('Stopped polling due to error.');
       spinner.clear();
       if (e.statusCode !== 404) {
         logApiErrorInstance(
@@ -63,6 +64,7 @@ const tailLogs = async ({
           })
         );
       }
+      process.exit();
     }
 
     if (latestLog && latestLog.results.length) {