diff --git a/src/distributed/remote_updates_rpc_server.hpp b/src/distributed/remote_updates_rpc_server.hpp
index 5d5fe9526..004743e4e 100644
--- a/src/distributed/remote_updates_rpc_server.hpp
+++ b/src/distributed/remote_updates_rpc_server.hpp
@@ -185,7 +185,7 @@ class RemoteUpdatesRpcServer {
           if (creation_result.result == RemoteUpdateResult::DONE &&
               data.to.worker_id() == db_.WorkerId()) {
             auto to_delta = database::StateDelta::AddInEdge(
-                data.tx_id, data.to.gid(), data.from,
+                data.tx_id, data.to.gid(), {data.from, db_.WorkerId()},
                 {creation_result.gid, db_.WorkerId()}, data.edge_type);
             creation_result.result =
                 GetUpdates(vertex_updates_, data.tx_id).Emplace(to_delta);
diff --git a/tests/unit/distributed_updates.cpp b/tests/unit/distributed_updates.cpp
index 62c01e023..37d5ccee7 100644
--- a/tests/unit/distributed_updates.cpp
+++ b/tests/unit/distributed_updates.cpp
@@ -173,6 +173,8 @@ class DistributedEdgeCreateTest : public DistributedGraphDbTest {
 
   void CreateEdge(database::GraphDb &creator, storage::VertexAddress from_addr,
                   storage::VertexAddress to_addr) {
+    CHECK(from_addr.is_remote() && to_addr.is_remote())
+        << "Local address given to CreateEdge";
     database::GraphDbAccessor dba{creator};
     auto edge_type = dba.EdgeType("et");
     VertexAccessor v1{from_addr, dba};