diff --git a/cmd/kaspawallet/daemon/server/create_unsigned_transaction.go b/cmd/kaspawallet/daemon/server/create_unsigned_transaction.go
index faee1906dc..23b18ba4ac 100644
--- a/cmd/kaspawallet/daemon/server/create_unsigned_transaction.go
+++ b/cmd/kaspawallet/daemon/server/create_unsigned_transaction.go
@@ -28,10 +28,12 @@ func (s *server) CreateUnsignedTransaction(_ context.Context, request *pb.Create
 		return nil, err
 	}
 
-	var fromAddress util.Address
-	fromAddress, err = util.DecodeAddress(request.From, s.params.Prefix)
-	if err != nil {
-		return nil, err
+	var fromAddress util.Address = nil
+	if request.From != "" {
+		fromAddress, err = util.DecodeAddress(request.From, s.params.Prefix)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	// TODO: Implement a better fee estimation mechanism