diff --git a/lib/classes/Error.js b/lib/classes/Error.js
index ad3f02e45..ac3f5f8ec 100644
--- a/lib/classes/Error.js
+++ b/lib/classes/Error.js
@@ -66,7 +66,12 @@ module.exports.logError = (exception, { forceExit = false } = {}) => {
     if (forceExit) process.exit();
   };
 
-  writeMessage(exceptionMeta.title, exceptionMeta.message);
+  writeMessage(
+    exceptionMeta.title,
+    exceptionMeta.stack && (!isUserError || process.env.SLS_DEBUG)
+      ? exceptionMeta.stack
+      : exceptionMeta.message
+  );
 
   if (!isUserError && !process.env.SLS_DEBUG) {
     const debugInfo = [
@@ -78,13 +83,6 @@ module.exports.logError = (exception, { forceExit = false } = {}) => {
     consoleLog(' ');
   }
 
-  if (exceptionMeta.stack && (!isUserError || process.env.SLS_DEBUG)) {
-    consoleLog(chalk.yellow('  Stack Trace --------------------------------------------'));
-    consoleLog(' ');
-    consoleLog(exceptionMeta.stack);
-    consoleLog(' ');
-  }
-
   const platform = process.platform;
   const nodeVersion = process.version.replace(/^[v|V]/, '');
   const slsVersion = version;
diff --git a/lib/classes/Error.test.js b/lib/classes/Error.test.js
index 8040fb979..691dc2157 100644
--- a/lib/classes/Error.test.js
+++ b/lib/classes/Error.test.js
@@ -145,7 +145,6 @@ describe('Error', () => {
       const message = consoleLogSpy.args.join('\n');
 
       expect(consoleLogSpy.called).to.equal(true);
-      expect(message).to.have.string('Stack Trace');
       expect(message).to.have.string(error.stack);
     });