diff --git a/src/auth.ts b/src/auth.ts
index 2ffc6e4..5a6e39d 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -16,7 +16,6 @@ import { error, info, warn } from './cli/messages';
 import { loginSelection } from './cli/selection';
 import { Config, save } from './config';
 import { ErrorCode } from './deploy';
-import { logout } from './logout';
 import { forever } from './utils';
 
 const authToken = async (config: Config): Promise<string> => {
@@ -55,15 +54,8 @@ const authToken = async (config: Config): Promise<string> => {
 	}
 
 	if (expiresIn(token) < config.renewTime) {
-		try {
-			// Attempt to refresh token
-			token = await api.refresh();
-		} catch (err) {
-			// If refresh fails, force logout
-			await logout();
-			info('Session expired. Please login again with email/password.');
-			process.exit(1);
-		}
+		// Token expires in < renewTime
+		token = await api.refresh();
 	}
 
 	return token;
diff --git a/src/cli/validateToken.ts b/src/cli/validateToken.ts
index 3ca107d..122ffca 100644
--- a/src/cli/validateToken.ts
+++ b/src/cli/validateToken.ts
@@ -1,7 +1,6 @@
 import { API as APIInterface } from '@metacall/protocol/protocol';
 import { unlink } from 'fs/promises';
 import { configFilePath, save } from '../config';
-import { logout } from '../logout';
 import { exists } from '../utils';
 import args from './args';
 import { error, info } from './messages';
@@ -10,14 +9,8 @@ const handleValidateToken = async (api: APIInterface): Promise<void> => {
 	const validToken = await api.validate();
 
 	if (!validToken) {
-		try {
-			const token = await api.refresh();
-			await save({ token });
-		} catch (err) {
-			await logout();
-			info('Token expired. Please login again.');
-			process.exit(1);
-		}
+		const token = await api.refresh();
+		await save({ token });
 	}
 };