diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 1ea8199e9c..c603761a2b 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -45,6 +45,9 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		}
 		
 		$sub = new Subscription();
+		
+		$sub->query('BEGIN');
+		
 		$sub->subscriber = $user->id;
 		$sub->subscribed = $other->id;
 
@@ -56,6 +59,8 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 			return;
 		}
 		
+		$sub->query('COMMIT');
+		
 		mail_subscribe_notify($other, $user);
 
 		$type = $apidata['content-type'];
@@ -91,7 +96,9 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		$sub->subscribed = $other->id;
 		
 		if ($sub->fetch(TRUE)) {
+			$sub->query('BEGIN');
 			$sub->delete();
+			$sub->query('COMMIT');
 		}
 
 		$type = $apidata['content-type'];