diff --git a/include/items.php b/include/items.php
index 9fd557a778..8b666f1ca2 100644
--- a/include/items.php
+++ b/include/items.php
@@ -354,7 +354,7 @@ function drop_item($id)
 
 	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found.') . EOL);
-		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
+		goaway('/network');
 	}
 
 	if ($item['deleted']) {
@@ -401,17 +401,17 @@ function drop_item($id)
 		}
 		// Now check how the user responded to the confirmation query
 		if (!empty($_REQUEST['canceled'])) {
-			goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
+			goaway('/item/drop/' . $id);
 		}
 
 		// delete the item
 		Item::deleteForUser(['id' => $item['id']], local_user());
 
-		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
+		goaway('/item/drop/' . $id);
 		//NOTREACHED
 	} else {
 		notice(L10n::t('Permission denied.') . EOL);
-		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
+		goaway('/item/drop/' . $id);
 		//NOTREACHED
 	}
 }
diff --git a/mod/events.php b/mod/events.php
index e5ebf86465..d6ad97eac6 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -187,7 +187,7 @@ function events_post(App $a)
 		Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
 	}
 
-	goaway($_SESSION['return_url']);
+	goaway('/events');
 }
 
 function events_content(App $a)
diff --git a/mod/filerm.php b/mod/filerm.php
index bd46a8bfea..55b218e151 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -25,9 +25,7 @@ function filerm_content(App $a) {
 		file_tag_unsave_file(local_user(),$item_id,$term, $category);
 	}
 
-	if (x($_SESSION,'return_url')) {
-		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
-	}
+	goaway('/network');
 
 	killme();
 }
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 987f31699e..ffaa6791f3 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -15,7 +15,7 @@ function ostatus_subscribe_content(App $a) {
 
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+		goaway('/ostatus_subscribe');
 		// NOTREACHED
 	}
 
diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 3acaa687a7..4499220817 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -14,7 +14,7 @@ function repair_ostatus_content(App $a) {
 
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
-		goaway($_SESSION['return_url']);
+		goaway('/ostatus_repair');
 		// NOTREACHED
 	}