diff --git a/Server/src/main/java/org/openas2/BaseSession.java b/Server/src/main/java/org/openas2/BaseSession.java
index b6ca390d..32e58b87 100644
--- a/Server/src/main/java/org/openas2/BaseSession.java
+++ b/Server/src/main/java/org/openas2/BaseSession.java
@@ -185,6 +185,38 @@ public void destroyPartnershipPollers(String configSourceFilter) {
         }
     }
 
+    /**
+     * Synchronously stop and untrack the poller for a single named partnership, if one is
+     * currently registered. Used when a partnership is deleted outside of a full config
+     * reload (e.g. via the REST API) so that its outbox directory is freed up immediately
+     * rather than waiting for the next scheduled partnerships file refresh.
+     *
+     * @param partnershipName - name attribute value for the partnership whose poller should be destroyed
+     */
+    public void destroyPartnershipPoller(String partnershipName) {
+        String pollerKeyToRemove = null;
+        for (Map.Entry<String, Map<String, Object>> entry : polledDirectories.entrySet()) {
+            Map<String, Object> meta = entry.getValue();
+            if (partnershipName.equals(meta.get("partnershipName"))) {
+                DirectoryPollingModule poller = (DirectoryPollingModule) meta.get("pollerInstance");
+                try {
+                    LOGGER.trace("Destroying poller for deleted partnership " + partnershipName + ":" + meta);
+                    if (poller.isRunning()) {
+                        poller.stop();
+                    }
+                } catch (Exception e) {
+                    LOGGER.error("Failed to stop the partnership poller for partnership " + partnershipName + ": " + meta, e);
+                }
+                pollerKeyToRemove = entry.getKey();
+                break;
+            }
+        }
+        if (pollerKeyToRemove != null) {
+            polledDirectories.remove(pollerKeyToRemove);
+            LOGGER.trace("Removed poller from cache map:" + pollerKeyToRemove);
+        }
+    }
+
     public DirectoryPollingModule getPartnershipPoller(String partnershipName) {
         for (Map.Entry<String, Map<String, Object>> entry : polledDirectories.entrySet()) {
             Map<String, Object> meta = entry.getValue();
diff --git a/Server/src/main/java/org/openas2/Session.java b/Server/src/main/java/org/openas2/Session.java
index 4213a719..7a0fc62d 100644
--- a/Server/src/main/java/org/openas2/Session.java
+++ b/Server/src/main/java/org/openas2/Session.java
@@ -112,6 +112,7 @@ public interface Session {
     
     public void startPartnershipPollers() throws OpenAS2Exception;
     public void destroyPartnershipPollers(String configSourceFilter);
+    public void destroyPartnershipPoller(String partnershipName);
 
     String getBaseDirectory();
 
diff --git a/Server/src/main/java/org/openas2/app/partner/DeletePartnershipCommand.java b/Server/src/main/java/org/openas2/app/partner/DeletePartnershipCommand.java
index 2f7f4b60..30265eb1 100644
--- a/Server/src/main/java/org/openas2/app/partner/DeletePartnershipCommand.java
+++ b/Server/src/main/java/org/openas2/app/partner/DeletePartnershipCommand.java
@@ -43,6 +43,7 @@ public CommandResult execute(PartnershipFactory partFx, Object[] params) throws
                     if (!((XMLPartnershipFactory) partFx).deleteElement("/partnerships/partnership[@name='" + name + "']")) {
                         return new CommandResult(CommandResult.TYPE_ERROR, "Partnership delete failed in XML document for partnership name: " + name);
                     }
+                    partFx.getSession().destroyPartnershipPoller(name);
                     return new CommandResult(CommandResult.TYPE_OK);
                 }
             }