diff --git a/flow/connectors/postgres/cdc.go b/flow/connectors/postgres/cdc.go
index 7f312e2012..47c524bb27 100644
--- a/flow/connectors/postgres/cdc.go
+++ b/flow/connectors/postgres/cdc.go
@@ -342,8 +342,7 @@ func PullCdcRecords[Items model.Items](
 	nextStandbyMessageDeadline := time.Now().Add(standbyMessageTimeout)
 
 	addRecordWithKey := func(key model.TableWithPkey, rec model.Record[Items]) error {
-		err := cdcRecordsStorage.Set(logger, key, rec)
-		if err != nil {
+		if err := cdcRecordsStorage.Set(logger, key, rec); err != nil {
 			return err
 		}
 		if err := records.AddRecord(ctx, rec); err != nil {
diff --git a/ui/app/api/peers/route.ts b/ui/app/api/peers/route.ts
index 4f468d8fb2..607f3658ae 100644
--- a/ui/app/api/peers/route.ts
+++ b/ui/app/api/peers/route.ts
@@ -1,6 +1,4 @@
-import { getTruePeer } from '@/app/api/peers/getTruePeer';
 import {
-  CatalogPeer,
   PeerConfig,
   UCreatePeerResponse,
   UValidatePeerResponse,
@@ -151,8 +149,9 @@ export async function POST(request: Request) {
 }
 
 // GET all the peers from the database
-export async function GET(request: Request) {
-  const peers = await prisma.peers.findMany();
-  const truePeers: Peer[] = peers.map((peer: CatalogPeer) => getTruePeer(peer));
-  return new Response(JSON.stringify(truePeers));
+export async function GET(_request: Request) {
+  const peers = await prisma.peers.findMany({
+    select: { name: true, type: true },
+  });
+  return new Response(JSON.stringify(peers));
 }
diff --git a/ui/app/dto/PeersDTO.ts b/ui/app/dto/PeersDTO.ts
index abc3bc80fb..81c559e77c 100644
--- a/ui/app/dto/PeersDTO.ts
+++ b/ui/app/dto/PeersDTO.ts
@@ -1,6 +1,7 @@
 import {
   BigqueryConfig,
   ClickhouseConfig,
+  DBType,
   ElasticsearchConfig,
   EventHubConfig,
   EventHubGroupConfig,
@@ -60,6 +61,7 @@ export type CatalogPeer = {
   type: number;
   options: Buffer;
 };
+export type PeerRef = { name: string; type: DBType };
 export type PeerSetter = React.Dispatch<React.SetStateAction<PeerConfig>>;
 
 export type SlotLagPoint = {
diff --git a/ui/app/mirrors/create/cdc/cdc.tsx b/ui/app/mirrors/create/cdc/cdc.tsx
index d55ba671ff..a02c41dfa0 100644
--- a/ui/app/mirrors/create/cdc/cdc.tsx
+++ b/ui/app/mirrors/create/cdc/cdc.tsx
@@ -12,6 +12,8 @@ import TableMapping from './tablemapping';
 interface MirrorConfigProps {
   settings: MirrorSetting[];
   mirrorConfig: CDCConfig;
+  destinationType: DBType;
+  sourceType: DBType;
   setter: MirrorSetter;
   rows: TableMapRow[];
   setRows: Dispatch<SetStateAction<TableMapRow[]>>;
@@ -33,6 +35,8 @@ export const defaultSyncMode = (dtype: DBType | undefined) => {
 export default function CDCConfigForm({
   settings,
   mirrorConfig,
+  destinationType,
+  sourceType,
   setter,
   rows,
   setRows,
@@ -45,22 +49,24 @@ export default function CDCConfigForm({
     setting.stateHandler(stateVal, setter);
   };
 
-  const normalSettings = useMemo(() => {
-    return settings!.filter(
-      (setting) =>
-        !(
-          (IsQueuePeer(mirrorConfig.destination?.type) &&
-            setting.advanced === AdvancedSettingType.QUEUE) ||
-          setting.advanced === AdvancedSettingType.ALL
-        )
-    );
-  }, [settings, mirrorConfig.destination?.type]);
+  const normalSettings = useMemo(
+    () =>
+      settings!.filter(
+        (setting) =>
+          !(
+            (IsQueuePeer(destinationType) &&
+              setting.advanced === AdvancedSettingType.QUEUE) ||
+            setting.advanced === AdvancedSettingType.ALL
+          )
+      ),
+    [settings, destinationType]
+  );
 
   const advancedSettings = useMemo(() => {
     return settings!
       .map((setting) => {
         if (
-          IsQueuePeer(mirrorConfig.destination?.type) &&
+          IsQueuePeer(destinationType) &&
           setting.advanced === AdvancedSettingType.QUEUE
         ) {
           setting.stateHandler(600, setter);
@@ -71,30 +77,29 @@ export default function CDCConfigForm({
         }
       })
       .filter((setting) => setting !== undefined);
-  }, [settings, mirrorConfig.destination?.type, setter]);
+  }, [settings, destinationType, setter]);
 
   const paramDisplayCondition = (setting: MirrorSetting) => {
     const label = setting.label.toLowerCase();
-    const isQueue = IsQueuePeer(mirrorConfig.destination?.type);
+    const isQueue = IsQueuePeer(destinationType);
     if (
       (label.includes('snapshot') && mirrorConfig.doInitialSnapshot !== true) ||
       (label === 'replication slot name' &&
         mirrorConfig.doInitialSnapshot === true) ||
       (label.includes('staging path') &&
-        defaultSyncMode(mirrorConfig.destination?.type) !== 'AVRO') ||
+        defaultSyncMode(destinationType) !== 'AVRO') ||
       (isQueue && label.includes('soft delete')) ||
-      (mirrorConfig.destination?.type === DBType.EVENTHUBS &&
+      (destinationType === DBType.EVENTHUBS &&
         (label.includes('initial copy') ||
           label.includes('initial load') ||
           label.includes('snapshot'))) ||
-      ((mirrorConfig.source?.type !== DBType.POSTGRES ||
-        mirrorConfig.destination?.type !== DBType.POSTGRES) &&
+      ((sourceType !== DBType.POSTGRES ||
+        destinationType !== DBType.POSTGRES) &&
         label.includes('type system')) ||
-      (mirrorConfig.destination?.type !== DBType.BIGQUERY &&
-        label.includes('column name')) ||
+      (destinationType !== DBType.BIGQUERY && label.includes('column name')) ||
       (label.includes('soft delete') &&
         ![DBType.BIGQUERY, DBType.POSTGRES, DBType.SNOWFLAKE].includes(
-          mirrorConfig.destination?.type ?? DBType.UNRECOGNIZED
+          destinationType ?? DBType.UNRECOGNIZED
         ))
     ) {
       return false;
@@ -104,17 +109,17 @@ export default function CDCConfigForm({
 
   useEffect(() => {
     setPubLoading(true);
-    fetchPublications(mirrorConfig.source?.name || '').then((pubs) => {
+    fetchPublications(mirrorConfig.source || '').then((pubs) => {
       setPublications(pubs);
       setPubLoading(false);
     });
-  }, [mirrorConfig.source?.name]);
+  }, [mirrorConfig.source]);
 
   if (mirrorConfig.source != undefined && mirrorConfig.destination != undefined)
     return (
       <>
-        {normalSettings!.map((setting, id) => {
-          return (
+        {normalSettings!.map(
+          (setting, id) =>
             paramDisplayCondition(setting!) && (
               <CDCField
                 key={id}
@@ -128,8 +133,7 @@ export default function CDCConfigForm({
                 optionsLoading={pubLoading}
               />
             )
-          );
-        })}
+        )}
         <Button
           className='IconButton'
           aria-label='collapse'
@@ -150,7 +154,7 @@ export default function CDCConfigForm({
         </Button>
 
         {show &&
-          advancedSettings!.map((setting, id) => {
+          advancedSettings!.map((setting) => {
             return (
               paramDisplayCondition(setting!) && (
                 <CDCField
@@ -163,10 +167,10 @@ export default function CDCConfigForm({
           })}
 
         <TableMapping
-          sourcePeerName={mirrorConfig.source?.name}
+          sourcePeerName={mirrorConfig.source}
           rows={rows}
           setRows={setRows}
-          peerType={mirrorConfig.destination?.type}
+          peerType={destinationType}
           omitAdditionalTablesMapping={new Map<string, string[]>()}
         />
       </>
diff --git a/ui/app/mirrors/create/handlers.ts b/ui/app/mirrors/create/handlers.ts
index 39ef3e6661..58016f5dd6 100644
--- a/ui/app/mirrors/create/handlers.ts
+++ b/ui/app/mirrors/create/handlers.ts
@@ -14,9 +14,11 @@ import {
   QRepConfig,
   QRepWriteType,
 } from '@/grpc_generated/flow';
-import { DBType, Peer, dBTypeToJSON } from '@/grpc_generated/peers';
+import { DBType, dBTypeToJSON } from '@/grpc_generated/peers';
 import { Dispatch, SetStateAction } from 'react';
+
 import { CDCConfig, TableMapRow } from '../../dto/MirrorsDTO';
+
 import {
   cdcSchema,
   flowNameSchema,
@@ -33,31 +35,11 @@ export const IsQueuePeer = (peerType?: DBType): boolean => {
   );
 };
 
-export const handlePeer = (
-  peer: Peer | null,
-  peerEnd: 'src' | 'dst',
-  setConfig: (value: SetStateAction<CDCConfig | QRepConfig>) => void
-) => {
-  if (!peer) return;
-  if (peerEnd === 'dst') {
-    setConfig((curr) => ({
-      ...curr,
-      destination: peer,
-      destinationPeer: peer,
-    }));
-  } else {
-    setConfig((curr) => ({
-      ...curr,
-      source: peer,
-      sourcePeer: peer,
-    }));
-  }
-};
-
 const CDCCheck = (
   flowJobName: string,
   rows: TableMapRow[],
-  config: CDCConfig
+  config: CDCConfig,
+  destinationType: DBType
 ) => {
   const flowNameValid = flowNameSchema.safeParse(flowJobName);
   if (!flowNameValid.success) {
@@ -82,7 +64,7 @@ const CDCCheck = (
     config.replicationSlotName = '';
   }
 
-  if (IsQueuePeer(config.destination?.type)) {
+  if (IsQueuePeer(destinationType)) {
     config.softDelete = false;
   }
 
@@ -163,10 +145,11 @@ export const handleCreateCDC = async (
   flowJobName: string,
   rows: TableMapRow[],
   config: CDCConfig,
+  destinationType: DBType,
   setLoading: Dispatch<SetStateAction<boolean>>,
   route: RouteCallback
 ) => {
-  const err = CDCCheck(flowJobName, rows, config);
+  const err = CDCCheck(flowJobName, rows, config, destinationType);
   if (err != '') {
     notifyErr(err);
     return;
@@ -202,6 +185,7 @@ export const handleCreateQRep = async (
   flowJobName: string,
   query: string,
   config: QRepConfig,
+  destinationType: DBType,
   setLoading: Dispatch<SetStateAction<boolean>>,
   route: RouteCallback,
   xmin?: boolean
@@ -255,14 +239,12 @@ export const handleCreateQRep = async (
   config.query = query;
 
   const isSchemaLessPeer =
-    config.destinationPeer?.type === DBType.BIGQUERY ||
-    config.destinationPeer?.type === DBType.CLICKHOUSE;
-  if (config.destinationPeer?.type !== DBType.ELASTICSEARCH) {
+    destinationType === DBType.BIGQUERY ||
+    destinationType === DBType.CLICKHOUSE;
+  if (destinationType !== DBType.ELASTICSEARCH) {
     if (isSchemaLessPeer && config.destinationTableIdentifier?.includes('.')) {
       notifyErr(
-        'Destination table should not be schema qualified for ' +
-          DBTypeToGoodText(config.destinationPeer?.type) +
-          ' targets'
+        `Destination table should not be schema qualified for ${DBTypeToGoodText(destinationType)} targets`
       );
       return;
     }
@@ -271,9 +253,7 @@ export const handleCreateQRep = async (
       !config.destinationTableIdentifier?.includes('.')
     ) {
       notifyErr(
-        'Destination table should be schema qualified for ' +
-          DBTypeToGoodText(config.destinationPeer?.type) +
-          ' targets'
+        `Destination table should be schema qualified for ${DBTypeToGoodText(destinationType)} targets`
       );
       return;
     }
@@ -428,10 +408,11 @@ export const handleValidateCDC = async (
   flowJobName: string,
   rows: TableMapRow[],
   config: CDCConfig,
+  destinationType: DBType,
   setLoading: Dispatch<SetStateAction<boolean>>
 ) => {
   setLoading(true);
-  const err = CDCCheck(flowJobName, rows, config);
+  const err = CDCCheck(flowJobName, rows, config, destinationType);
   if (err != '') {
     notifyErr(err);
     setLoading(false);
diff --git a/ui/app/mirrors/create/helpers/common.ts b/ui/app/mirrors/create/helpers/common.ts
index fb10620af3..3a9d969041 100644
--- a/ui/app/mirrors/create/helpers/common.ts
+++ b/ui/app/mirrors/create/helpers/common.ts
@@ -21,8 +21,8 @@ export interface MirrorSetting {
 }
 
 export const blankCDCSetting: CDCConfig = {
-  source: undefined,
-  destination: undefined,
+  source: '',
+  destination: '',
   flowJobName: '',
   tableMappings: [],
   maxBatchSize: 1000000,
diff --git a/ui/app/mirrors/create/page.tsx b/ui/app/mirrors/create/page.tsx
index 2b0f59d33e..8da167f0b9 100644
--- a/ui/app/mirrors/create/page.tsx
+++ b/ui/app/mirrors/create/page.tsx
@@ -4,7 +4,7 @@ import QRepQueryTemplate from '@/app/utils/qreptemplate';
 import { DBTypeToImageMapping } from '@/components/PeerComponent';
 import { RequiredIndicator } from '@/components/RequiredIndicator';
 import { QRepConfig } from '@/grpc_generated/flow';
-import { DBType, Peer } from '@/grpc_generated/peers';
+import { DBType } from '@/grpc_generated/peers';
 import { Button } from '@/lib/Button';
 import { Icon } from '@/lib/Icon';
 import { Label } from '@/lib/Label';
@@ -16,18 +16,18 @@ import { Divider } from '@tremor/react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter, useSearchParams } from 'next/navigation';
-import { useEffect, useState } from 'react';
-import ReactSelect from 'react-select';
+import { useCallback, useEffect, useState } from 'react';
+import ReactSelect, { SingleValue } from 'react-select';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import { InfoPopover } from '../../../components/InfoPopover';
 import PeerDBCodeEditor from '../../../components/PeerDBEditor';
 import { CDCConfig, MirrorType, TableMapRow } from '../../dto/MirrorsDTO';
+import { PeerRef } from '../../dto/PeersDTO';
 import CDCConfigForm from './cdc/cdc';
 import {
   handleCreateCDC,
   handleCreateQRep,
-  handlePeer,
   handleValidateCDC,
 } from './handlers';
 import { cdcSettings } from './helpers/cdc';
@@ -37,11 +37,11 @@ import MirrorCards from './mirrorcards';
 import QRepConfigForm from './qrep/qrep';
 import * as styles from './styles';
 
-function getPeerValue(peer: Peer) {
+function getPeerValue(peer: PeerRef) {
   return peer.name;
 }
 
-function getPeerLabel(peer: Peer) {
+function getPeerLabel(peer: PeerRef) {
   return (
     <div style={{ display: 'flex', alignItems: 'center' }}>
       <div style={{ width: '5%', height: '5%' }}>
@@ -69,7 +69,11 @@ export default function CreateMirrors() {
   const [creating, setCreating] = useState<boolean>(false);
   const [validating, setValidating] = useState<boolean>(false);
   const [config, setConfig] = useState<CDCConfig | QRepConfig>(blankCDCSetting);
-  const [peers, setPeers] = useState<Peer[]>([]);
+  const [sourceType, setSourceType] = useState<DBType>(DBType.UNRECOGNIZED);
+  const [destinationType, setDestinationType] = useState<DBType>(
+    DBType.UNRECOGNIZED
+  );
+  const [peers, setPeers] = useState<PeerRef[]>([]);
   const [rows, setRows] = useState<TableMapRow[]>([]);
   const [qrepQuery, setQrepQuery] = useState<string>(QRepQueryTemplate);
 
@@ -81,7 +85,25 @@ export default function CreateMirrors() {
       });
   }, [mirrorType]);
 
-  let listMirrorsPage = () => {
+  const setSourcePeer = useCallback((peer: SingleValue<PeerRef>) => {
+    if (!peer) return;
+    setConfig((curr) => ({
+      ...curr,
+      source: peer.name,
+    }));
+    setSourceType(peer.type);
+  }, []);
+
+  const setDestinationPeer = useCallback((peer: SingleValue<PeerRef>) => {
+    if (!peer) return;
+    setConfig((curr) => ({
+      ...curr,
+      destination: peer.name,
+    }));
+    setDestinationType(peer.type);
+  }, []);
+
+  const listMirrorsPage = () => {
     router.push('/mirrors');
   };
 
@@ -124,57 +146,53 @@ export default function CreateMirrors() {
               />
             }
           />
-          {['src', 'dst'].map((peerEnd, index) => {
-            return (
-              <RowWithSelect
-                key={index}
-                label={
-                  <Label>
-                    {peerEnd === 'src' ? 'Source Peer' : 'Destination Peer'}
-                    {RequiredIndicator(true)}
-                  </Label>
-                }
-                action={
-                  <div
-                    style={{
-                      display: 'flex',
-                      flexDirection: 'row',
-                      alignItems: 'center',
-                    }}
-                  >
-                    <div style={{ width: '100%' }}>
-                      <ReactSelect
-                        placeholder={`Select the ${
-                          peerEnd === 'src' ? 'source' : 'destination'
-                        } peer`}
-                        onChange={(val) =>
-                          handlePeer(val, peerEnd as 'src' | 'dst', setConfig)
-                        }
-                        options={
-                          (peerEnd === 'src'
-                            ? peers.filter(
-                                (peer) => peer.type == DBType.POSTGRES
-                              )
-                            : peers) ?? []
-                        }
-                        getOptionValue={getPeerValue}
-                        formatOptionLabel={getPeerLabel}
-                        theme={SelectTheme}
-                      />
-                    </div>
-                    <InfoPopover
-                      tips={
-                        'The peer from which we will be replicating data. Ensure the prerequisites for this peer are met.'
+          {['src', 'dst'].map((peerEnd, index) => (
+            <RowWithSelect
+              key={index}
+              label={
+                <Label>
+                  {peerEnd === 'src' ? 'Source Peer' : 'Destination Peer'}
+                  {RequiredIndicator(true)}
+                </Label>
+              }
+              action={
+                <div
+                  style={{
+                    display: 'flex',
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                  }}
+                >
+                  <div style={{ width: '100%' }}>
+                    <ReactSelect
+                      placeholder={`Select the ${
+                        peerEnd === 'src' ? 'source' : 'destination'
+                      } peer`}
+                      onChange={
+                        peerEnd === 'src' ? setSourcePeer : setDestinationPeer
                       }
-                      link={
-                        'https://docs.peerdb.io/usecases/Real-time%20CDC/postgres-to-snowflake#prerequisites'
+                      options={
+                        (peerEnd === 'src'
+                          ? peers.filter((peer) => peer.type == DBType.POSTGRES)
+                          : peers) ?? []
                       }
+                      getOptionValue={getPeerValue}
+                      formatOptionLabel={getPeerLabel}
+                      theme={SelectTheme}
                     />
                   </div>
-                }
-              />
-            );
-          })}
+                  <InfoPopover
+                    tips={
+                      'The peer from which we will be replicating data. Ensure the prerequisites for this peer are met.'
+                    }
+                    link={
+                      'https://docs.peerdb.io/usecases/Real-time%20CDC/postgres-to-snowflake#prerequisites'
+                    }
+                  />
+                </div>
+              }
+            />
+          ))}
 
           <Divider style={{ marginTop: '1rem', marginBottom: '1rem' }} />
 
@@ -233,6 +251,8 @@ export default function CreateMirrors() {
             <CDCConfigForm
               settings={cdcSettings}
               mirrorConfig={config as CDCConfig}
+              sourceType={sourceType}
+              destinationType={destinationType}
               setter={setConfig}
               rows={rows}
               setRows={setRows}
@@ -241,6 +261,7 @@ export default function CreateMirrors() {
             <QRepConfigForm
               settings={qrepSettings}
               mirrorConfig={config as QRepConfig}
+              destinationType={destinationType}
               setter={setConfig}
               xmin={mirrorType === MirrorType.XMin}
             />
@@ -259,6 +280,7 @@ export default function CreateMirrors() {
                       mirrorName,
                       rows,
                       config as CDCConfig,
+                      destinationType,
                       setValidating
                     )
                   }
@@ -282,6 +304,7 @@ export default function CreateMirrors() {
                         mirrorName,
                         rows,
                         config as CDCConfig,
+                        destinationType,
                         setCreating,
                         listMirrorsPage
                       )
@@ -289,6 +312,7 @@ export default function CreateMirrors() {
                         mirrorName,
                         qrepQuery,
                         config as QRepConfig,
+                        destinationType,
                         setCreating,
                         listMirrorsPage,
                         mirrorType === MirrorType.XMin // for handling xmin specific
diff --git a/ui/app/mirrors/create/qrep/qrep.tsx b/ui/app/mirrors/create/qrep/qrep.tsx
index c879cdaaa3..78dc52735c 100644
--- a/ui/app/mirrors/create/qrep/qrep.tsx
+++ b/ui/app/mirrors/create/qrep/qrep.tsx
@@ -2,6 +2,7 @@
 import SelectTheme from '@/app/styles/select';
 import { RequiredIndicator } from '@/components/RequiredIndicator';
 import { QRepConfig, QRepWriteType } from '@/grpc_generated/flow';
+import { DBType } from '@/grpc_generated/peers';
 import { Label } from '@/lib/Label';
 import { RowWithSelect, RowWithSwitch, RowWithTextField } from '@/lib/Layout';
 import { Switch } from '@/lib/Switch';
@@ -19,6 +20,7 @@ import UpsertColsDisplay from './upsertcols';
 interface QRepConfigProps {
   settings: MirrorSetting[];
   mirrorConfig: QRepConfig;
+  destinationType: DBType;
   setter: MirrorSetter;
   xmin?: boolean;
 }
@@ -38,6 +40,7 @@ const allowedTypesForWatermarkColumn = [
 export default function QRepConfigForm({
   settings,
   mirrorConfig,
+  destinationType,
   setter,
   xmin,
 }: QRepConfigProps) {
@@ -78,7 +81,7 @@ export default function QRepConfigForm({
         mirrorConfig.writeMode?.writeType !=
           QRepWriteType.QREP_WRITE_MODE_UPSERT) ||
       (label.includes('staging') &&
-        defaultSyncMode(mirrorConfig.destinationPeer?.type) !== 'AVRO') ||
+        defaultSyncMode(destinationType) !== 'AVRO') ||
       (label.includes('watermark column') && xmin) ||
       (label.includes('initial copy') && xmin)
     ) {
@@ -90,22 +93,19 @@ export default function QRepConfigForm({
   const loadColumnOptions = (tableIdentifier: string) => {
     const schema = tableIdentifier.split('.')[0];
     const table = tableIdentifier.split('.')[1];
-    fetchColumns(
-      mirrorConfig.sourcePeer?.name ?? '',
-      schema,
-      table,
-      setLoading
-    ).then((cols) => {
-      const filteredCols = cols?.filter((col) =>
-        allowedTypesForWatermarkColumn.includes(col.split(':')[1])
-      );
-      setWatermarkColumns(
-        filteredCols.map((col) => ({
-          value: col.split(':')[0],
-          label: `${col.split(':')[0]} (${col.split(':')[1]})`,
-        }))
-      );
-    });
+    fetchColumns(mirrorConfig.sourcePeer, schema, table, setLoading).then(
+      (cols) => {
+        const filteredCols = cols?.filter((col) =>
+          allowedTypesForWatermarkColumn.includes(col.split(':')[1])
+        );
+        setWatermarkColumns(
+          filteredCols.map((col) => ({
+            value: col.split(':')[0],
+            label: `${col.split(':')[0]} (${col.split(':')[1]})`,
+          }))
+        );
+      }
+    );
   };
 
   const handleSourceChange = (
@@ -121,7 +121,7 @@ export default function QRepConfigForm({
   };
 
   useEffect(() => {
-    fetchAllTables(mirrorConfig.sourcePeer?.name ?? '').then((tables) =>
+    fetchAllTables(mirrorConfig.sourcePeer).then((tables) =>
       setSourceTables(tables?.map((table) => ({ value: table, label: table })))
     );
   }, [mirrorConfig.sourcePeer]);
@@ -132,7 +132,7 @@ export default function QRepConfigForm({
   }, [setter]);
   return (
     <>
-      {mirrorConfig.sourcePeer?.name ? (
+      {mirrorConfig.sourcePeer ? (
         settings.map((setting, id) => {
           return (
             paramDisplayCondition(setting) &&
@@ -204,7 +204,7 @@ export default function QRepConfigForm({
                               ? 'Select a column'
                               : 'Select a table'
                           }
-                          onChange={(val, action) =>
+                          onChange={(val, _action) =>
                             handleSourceChange(val?.value, setting)
                           }
                           isLoading={loading}
diff --git a/ui/components/DropDialog.tsx b/ui/components/DropDialog.tsx
index 9a1062d40e..d4b970d0b2 100644
--- a/ui/components/DropDialog.tsx
+++ b/ui/components/DropDialog.tsx
@@ -2,7 +2,6 @@
 import { UDropMirrorResponse } from '@/app/dto/MirrorsDTO';
 import { UDropPeerResponse } from '@/app/dto/PeersDTO';
 import { DeleteScript } from '@/app/scripts/handlers';
-import { Peer } from '@/grpc_generated/peers';
 import { Button } from '@/lib/Button';
 import { Dialog, DialogClose } from '@/lib/Dialog';
 import { Icon } from '@/lib/Icon';
@@ -14,8 +13,8 @@ import { BarLoader } from 'react-spinners';
 interface dropMirrorArgs {
   workflowId: string | null;
   flowJobName: string;
-  sourcePeer: Peer;
-  destinationPeer: Peer;
+  sourcePeer: string;
+  destinationPeer: string;
   forResync?: boolean;
 }