diff --git a/extensions/subscriptions/src/Gambit/SubscriptionGambit.php b/extensions/subscriptions/src/Gambit/SubscriptionGambit.php
index b906945f5..e3f0588c2 100644
--- a/extensions/subscriptions/src/Gambit/SubscriptionGambit.php
+++ b/extensions/subscriptions/src/Gambit/SubscriptionGambit.php
@@ -33,7 +33,7 @@ class SubscriptionGambit extends AbstractRegexGambit
         $search->getQuery()->$method(function ($query) use ($actor, $matches) {
             $query->selectRaw('1')
                   ->from('users_discussions')
-                  ->whereRaw('discussions.id = discussion_id')
+                  ->whereColumn('discussions.id', 'discussion_id')
                   ->where('user_id', $actor->id)
                   ->where('subscription', $matches[1] === 'follow' ? 'follow' : 'ignore');
         });
diff --git a/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php b/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
index 60dc30dfd..e8b4ac1f0 100755
--- a/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
+++ b/extensions/subscriptions/src/Listener/FilterDiscussionListBySubscription.php
@@ -46,7 +46,7 @@ class FilterDiscussionListBySubscription
             $event->search->getQuery()->whereNotExists(function ($query) use ($actor) {
                 $query->selectRaw(1)
                       ->from('users_discussions')
-                      ->whereRaw('discussions.id = discussion_id')
+                      ->whereColumn('discussions.id', 'discussion_id')
                       ->where('user_id', $actor->id)
                       ->where('subscription', 'ignore');
             });