diff --git a/patches/server/1005-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/1005-Don-t-tab-complete-namespaced-commands-if-send-names.patch
new file mode 100644
index 0000000000..98c664c42d
--- /dev/null
+++ b/patches/server/1005-Don-t-tab-complete-namespaced-commands-if-send-names.patch
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: EpicPlayerA10 <adasko.lesiak@gmail.com>
+Date: Sun, 18 Jun 2023 12:38:24 +0200
+Subject: [PATCH] Don't tab-complete namespaced commands if send-namespaced is
+ false
+
+Tab-complete packet is supposed to tab-complete args for commands, but
+it also can suggest commands like in version 1.12.2 or lower.
+
+This patch prevents server from sending namespaced commands when player
+requests tab-complete only commands.
+
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 721243ebf0fb126cf5c0de76c6bd990807f097f4..e8923befdee3514be5346c6e6c8e7236e7e6e668 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -920,6 +920,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+                         ParseResults<CommandSourceStack> parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack());
+ 
+                         this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> {
++                            // Paper start - Don't tab-complete namespaced commands if send-namespaced is false
++                            if (!org.spigotmc.SpigotConfig.sendNamespaced && suggestions.getRange().getStart() <= 1) {
++                                suggestions.getList().removeIf(suggestion -> suggestion.getText().contains(":"));
++                            }
++                            // Paper end
+                             // Paper start - Brigadier API
+                             com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent suggestEvent = new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendSuggestionsEvent(this.getCraftPlayer(), suggestions, command);
+                             suggestEvent.setCancelled(suggestions.isEmpty());