diff --git a/app/Observers/CompanyGatewayObserver.php b/app/Observers/CompanyGatewayObserver.php
index 819fc021b3ad..4c483819824b 100644
--- a/app/Observers/CompanyGatewayObserver.php
+++ b/app/Observers/CompanyGatewayObserver.php
@@ -55,7 +55,10 @@ class CompanyGatewayObserver
     public function restored(CompanyGateway $company_gateway)
     {
         //When we restore the gateway, bring back the tokens!
-        ClientGatewayToken::where('company_gateway_id', $company_gateway->id)->withTrashed()->get()->restore();
+        ClientGatewayToken::where('company_gateway_id', $company_gateway->id)
+                          ->withTrashed()->cursor()->each(function ($cgt){
+                            $cgt->restore();
+                          });
     }
 
     /**