diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch
index f00f09b6a3..b4d1577971 100644
--- a/nms-patches/DedicatedServer.patch
+++ b/nms-patches/DedicatedServer.patch
@@ -224,7 +224,7 @@
 +                RemoteServerCommandEvent event = new RemoteServerCommandEvent(remoteConsole, s);
 +                server.getPluginManager().callEvent(event);
 +                if (event.isCancelled()) {
-+                    return null;
++                    return "";
 +                }
 +                // Event change end
 +                ServerCommand serverCommand = new ServerCommand(event.getCommand(), RemoteControlCommandListener.getInstance());
diff --git a/nms-patches/RemoteControlSession.patch b/nms-patches/RemoteControlSession.patch
deleted file mode 100644
index 4c1fcfd031..0000000000
--- a/nms-patches/RemoteControlSession.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/net/minecraft/server/RemoteControlSession.java
-+++ b/net/minecraft/server/RemoteControlSession.java
-@@ -32,8 +32,8 @@
-     }
- 
-     public void run() {
--        while (true) {
--            try {
-+        try { // CraftBukkit // PAIL: FF issue
-+            while (true) { // CraftBukkit // PAIL: FF issue
-                 if (!this.a) {
-                     break;
-                 }
-@@ -62,7 +62,10 @@
-                             String s = StatusChallengeUtils.a(this.k, k, i);
- 
-                             try {
--                                this.a(l, this.b.executeRemoteCommand(s));
-+                                // CraftBukkit start
-+                                String result = this.b.executeRemoteCommand(s);
-+                                if (result != null) this.a(l, result);
-+                                // CraftBukkit end
-                             } catch (Exception exception) {
-                                 this.a(l, "Error executing: " + s + " (" + exception.getMessage() + ")");
-                             }
-@@ -90,20 +93,20 @@
-                         this.a(l, String.format("Unknown request %s", new Object[] { Integer.toHexString(i1)}));
-                         continue;
-                     }
--                }
-+                } }
-             } catch (SocketTimeoutException sockettimeoutexception) {
--                break;
-+                // break; // CraftBukkit // PAIL: FF issue
-             } catch (IOException ioexception) {
--                break;
-+                // break; // CraftBukkit // PAIL: FF issue
-             } catch (Exception exception1) {
-                 RemoteControlSession.h.error("Exception whilst parsing RCON input", exception1);
--                break;
-+                // break; // CraftBukkit // PAIL: FF issue
-             } finally {
-                 this.g();
-             }
- 
-             return;
--        }
-+        // } // CraftBukkit // PAIL: FF issue
- 
-     }
-