diff --git a/app/Listeners/OnUserRegistration.php b/app/Listeners/OnUserRegistration.php
index f2fa814..c866cd5 100755
--- a/app/Listeners/OnUserRegistration.php
+++ b/app/Listeners/OnUserRegistration.php
@@ -49,10 +49,11 @@ class OnUserRegistration
         // TODO: Send push notification to online admins via browser (w/ pusher)
         Log::info('User '.$event->user->name.' has just registered for an account.');
 
-        foreach (User::all() as $user) {
-            if ($user->hasRole('admin')) {
-                $user->notify(new NewUser($event->user));
-            }
-        }
+        User::whereHas('roles', function ($q) {
+           $q->where('name', 'admin');
+        })->get()->each(function ($user, $key) use ($event) {
+            $user->notify(new NewUser($event->user));
+        });
+
     }
 }