diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 4877f45dc..e03d55b00 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -81,14 +81,16 @@ class DataStore(RoomMemberStore, RoomStore,
         self._next_stream_id = int(hs.get_clock().time_msec()) * 1000
 
     def insert_client_ip(self, user, access_token, device_id, ip, user_agent):
-        return self._simple_insert(
+        return self._simple_upsert(
             "user_ips",
-            {
+            keyvalues={
                 "user": user.to_string(),
                 "access_token": access_token,
-                "device_id": device_id,
                 "ip": ip,
                 "user_agent": user_agent,
+            },
+            values={
+                "device_id": device_id,
                 "last_seen": int(self._clock.time_msec()),
             },
             desc="insert_client_ip",
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index 1a5bb41cb..c6e00ae3f 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -84,14 +84,14 @@ class TransactionStore(SQLBaseStore):
 
     def _set_received_txn_response(self, txn, transaction_id, origin, code,
                                    response_json):
-        self._simple_update_one_txn(
+        self._simple_upsert_txn(
             txn,
             table=ReceivedTransactionsTable.table_name,
             keyvalues={
                 "transaction_id": transaction_id,
                 "origin": origin,
             },
-            updatevalues={
+            values={
                 "response_code": code,
                 "response_json": response_json,
             }