diff --git a/lib/PBot/Core/Factoids/Interpreter.pm b/lib/PBot/Core/Factoids/Interpreter.pm
index 0fe1ae74..b1db0e26 100644
--- a/lib/PBot/Core/Factoids/Interpreter.pm
+++ b/lib/PBot/Core/Factoids/Interpreter.pm
@@ -358,7 +358,10 @@ sub handle_action($self, $context, $action) {
                 my $target = $self->{pbot}->{nicklist}->is_present_similar($context->{from}, $context->{arguments});
 
                 if ($target and $action !~ /\$\{?(?:nick|args)\b/) {
-                    $context->{nickprefix} = $target unless $context->{nickprefix_forced};
+                    my $add_nick = $self->{pbot}->{factoids}->{data}->{storage}->get_data($channel, $keyword, 'add_nick');
+                    unless (defined $add_nick && $add_nick == 0) {
+                        $context->{nickprefix} = $target unless $context->{nickprefix_forced};
+                    }
                 }
             }
         }
diff --git a/lib/PBot/VERSION.pm b/lib/PBot/VERSION.pm
index 4088ec54..52ae2976 100644
--- a/lib/PBot/VERSION.pm
+++ b/lib/PBot/VERSION.pm
@@ -25,8 +25,8 @@ use PBot::Imports;
 # These are set by the /misc/update_version script
 use constant {
     BUILD_NAME     => "PBot",
-    BUILD_REVISION => 4839,
-    BUILD_DATE     => "2024-11-05",
+    BUILD_REVISION => 4840,
+    BUILD_DATE     => "2024-11-06",
 };
 
 sub initialize {}