diff --git a/src/Traits/TenantAwareCommand.php b/src/Traits/TenantAwareCommand.php
index 2d18a265..e86168df 100644
--- a/src/Traits/TenantAwareCommand.php
+++ b/src/Traits/TenantAwareCommand.php
@@ -10,7 +10,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 trait TenantAwareCommand
 {
-    /** @return mixed|void */
+    /** @return int */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $tenants = $this->getTenants();
@@ -21,13 +21,18 @@ trait TenantAwareCommand
             });
         }
 
+        $exitCode = 0;
         foreach ($tenants as $tenant) {
-            $tenant->run(function () {
-                $this->laravel->call([$this, 'handle']);
+            $result = (int) $tenant->run(function () {
+                return $this->laravel->call([$this, 'handle']);
             });
+
+            if ($result !== 0) {
+                $exitCode = $result;
+            }
         }
 
-        return 1;
+        return $exitCode;
     }
 
     /**
diff --git a/tests/Traits/TenantAwareCommandTest.php b/tests/Traits/TenantAwareCommandTest.php
index 58cc33c8..fcc3d0e2 100644
--- a/tests/Traits/TenantAwareCommandTest.php
+++ b/tests/Traits/TenantAwareCommandTest.php
@@ -22,7 +22,7 @@ class TenantAwareCommandTest extends TestCase
         ]);
 
         $this->artisan('user:add')
-            ->assertExitCode(1);
+            ->assertExitCode(0);
 
         tenancy()->initializeTenancy($tenant1);
         $this->assertNotEmpty(\DB::table('users')->get());