diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index c65beb379..9c6ea16e7 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -405,31 +405,34 @@ class Queue
                         do_delivery($piled_up, true);
                     }
                 }
-            } else {
-                if ($result['return_code'] >= 300) {
+            }
+            elseif ($result['return_code'] >= 400 && $result['return_code'] < 500) {
+                q(
+                    "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
+                    dbesc('delivery rejected' . ' ' . $result['return_code']),
+                    dbesc(datetime_convert()),
+                    dbesc($outq['outq_hash'])
+                );
+                self::remove($outq['outq_hash']);
+
+            }
+            else {
+                $dr = q(
+                    "select * from dreport where dreport_queue = '%s'",
+                    dbesc($outq['outq_hash'])
+                );
+                if ($dr) {
+                    // update every queue entry going to this site with the most recent communication error
                     q(
-                        "update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'",
-                        dbesc('delivery rejected' . ' ' . $result['return_code']),
-                        dbesc(datetime_convert()),
-                        dbesc($outq['outq_hash'])
+                        "update dreport set dreport_log = '%s' where dreport_site = '%s'",
+                         dbesc(z_curl_error($result)),
+                        dbesc($dr[0]['dreport_site'])
                     );
-                } else {
-                    $dr = q(
-                        "select * from dreport where dreport_queue = '%s'",
-                        dbesc($outq['outq_hash'])
-                    );
-                    if ($dr) {
-                        // update every queue entry going to this site with the most recent communication error
-                        q(
-                            "update dreport set dreport_log = '%s' where dreport_site = '%s'",
-                            dbesc(z_curl_error($result)),
-                            dbesc($dr[0]['dreport_site'])
-                        );
-                    }
                 }
-                logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
                 self::update($outq['outq_hash'], 10);
             }
+    
+            logger('deliver: queue post returned ' . $result['return_code'] . ' from ' . $outq['outq_posturl'], LOGGER_DEBUG);
             return;
         }