diff --git a/doc/release/RELEASE-NOTES.md b/doc/release/RELEASE-NOTES.md
index 8d0283c06..f66003075 100644
--- a/doc/release/RELEASE-NOTES.md
+++ b/doc/release/RELEASE-NOTES.md
@@ -67,6 +67,7 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 * [OSDEV-1695](https://opensupplyhub.atlassian.net/browse/OSDEV-1695) - [SLC] Enabled the claim button for updated production locations when a moderation event has a pending status. Disabled claim button explicitly if production location has pending claim status.
 * [OSDEV-1701](https://opensupplyhub.atlassian.net/browse/OSDEV-1701) - Refactored "Go Back" button in production location info page.
 * [OSDEV-1672](https://opensupplyhub.atlassian.net/browse/OSDEV-1672) - SLC. Implement collecting contribution data page (FE) - All Multi-Selects on the page have been fixed. They resize based on the number of items selected.
+* [OSDEV-1696](https://opensupplyhub.atlassian.net/browse/OSDEV-1696) - Added loader on single production location fetch; added error handling; added cleanup hook to clear production location data on component unmount.
 * [OSDEV-1653](https://opensupplyhub.atlassian.net/browse/OSDEV-1653) - Added asterisks next to each required form field (Name, Address, and Country) on the "Search by Name and Address" tab. Highlighted an empty field and displayed an error message if it loses focus. Added proper styles for the error messages.
 * [OSDEV-1589](https://opensupplyhub.atlassian.net/browse/OSDEV-1589) - Fixed layout issue on new `contribute` page.
 
diff --git a/src/react/src/components/Contribute/ProductionLocationInfo.jsx b/src/react/src/components/Contribute/ProductionLocationInfo.jsx
index 7e4d02703..6bf3e6773 100644
--- a/src/react/src/components/Contribute/ProductionLocationInfo.jsx
+++ b/src/react/src/components/Contribute/ProductionLocationInfo.jsx
@@ -12,6 +12,7 @@ import IconButton from '@material-ui/core/IconButton';
 import Typography from '@material-ui/core/Typography';
 import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
 import ArrowDropUpIcon from '@material-ui/icons/ArrowDropUp';
+import CircularProgress from '@material-ui/core/CircularProgress';
 import StyledSelect from '../Filters/StyledSelect';
 import { productionLocationInfoStyles } from '../../util/styles';
 import {
@@ -29,6 +30,7 @@ import {
     updateProductionLocation,
     fetchProductionLocationByOsId,
     resetPendingModerationEvent,
+    resetSingleProductionLocation,
 } from '../../actions/contributeProductionLocation';
 import {
     fetchSingleModerationEvent,
@@ -69,9 +71,12 @@ const ProductionLocationInfo = ({
     singleModerationEventItemError,
     fetchProductionLocation,
     singleProductionLocationData,
+    singleProductionLocationFetching,
+    singleProductionLocationError,
     innerWidth,
     handleCleanupContributionRecord,
     handleResetPendingModerationEvent,
+    handleResetSingleProductionLocation,
 }) => {
     const location = useLocation();
     const history = useHistory();
@@ -362,6 +367,14 @@ const ProductionLocationInfo = ({
         moderationID,
     ]);
 
+    useEffect(() => {
+        if (!isEmpty(singleProductionLocationError)) {
+            toast(singleProductionLocationError[0]);
+        }
+    }, [singleProductionLocationError]);
+
+    useEffect(() => () => handleResetSingleProductionLocation(), []);
+
     return (
         <>
             <div className={classes.mainContainerStyles}>
@@ -372,391 +385,403 @@ const ProductionLocationInfo = ({
                     {`Use the form below to edit the name, address, and country
                     for your production location. ${instructionExtraMessage}`}
                 </Typography>
-                <Paper className={classes.infoWrapStyles}>
-                    <div
-                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                    >
-                        <Typography
-                            component="h2"
-                            className={classes.titleStyles}
+                {singleProductionLocationFetching ? (
+                    <CircularProgress />
+                ) : (
+                    <Paper className={classes.infoWrapStyles}>
+                        <div
+                            className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                         >
-                            Location Name
-                        </Typography>
-                        <Typography
-                            component="h4"
-                            className={classes.subTitleStyles}
-                        >
-                            Enter the name of the production location that you
-                            are uploading.
-                        </Typography>
-                        <TextField
-                            id="name"
-                            className={classes.textInputStyles}
-                            value={inputName}
-                            onChange={handleNameChange}
-                            placeholder="Enter the name"
-                            variant="outlined"
-                            aria-label="Enter the name"
-                            InputProps={{
-                                classes: {
-                                    input: `
+                            <Typography
+                                component="h2"
+                                className={classes.titleStyles}
+                            >
+                                Location Name
+                            </Typography>
+                            <Typography
+                                component="h4"
+                                className={classes.subTitleStyles}
+                            >
+                                Enter the name of the production location that
+                                you are uploading.
+                            </Typography>
+                            <TextField
+                                id="name"
+                                className={classes.textInputStyles}
+                                value={inputName}
+                                onChange={handleNameChange}
+                                placeholder="Enter the name"
+                                variant="outlined"
+                                aria-label="Enter the name"
+                                InputProps={{
+                                    classes: {
+                                        input: `
                                     ${
                                         nameTouched &&
                                         isEmpty(inputName) &&
                                         classes.errorStyle
                                     }`,
-                                    notchedOutline:
-                                        classes.notchedOutlineStyles,
-                                },
-                            }}
-                            helperText={
-                                nameTouched &&
-                                isEmpty(inputName) && <InputErrorText />
-                            }
-                            FormHelperTextProps={{
-                                className: classes.helperText,
-                            }}
-                            error={nameTouched && isEmpty(inputName)}
-                        />
-                    </div>
-                    <div
-                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                    >
-                        <Typography
-                            component="h2"
-                            className={classes.titleStyles}
-                        >
-                            Address
-                        </Typography>
-                        <Typography
-                            component="h4"
-                            className={classes.subTitleStyles}
+                                        notchedOutline:
+                                            classes.notchedOutlineStyles,
+                                    },
+                                }}
+                                helperText={
+                                    nameTouched &&
+                                    isEmpty(inputName) && <InputErrorText />
+                                }
+                                FormHelperTextProps={{
+                                    className: classes.helperText,
+                                }}
+                                error={nameTouched && isEmpty(inputName)}
+                            />
+                        </div>
+                        <div
+                            className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                         >
-                            Enter the address of the production location. We
-                            will use this to plot the location on a map.
-                        </Typography>
-                        <TextField
-                            id="address"
-                            className={classes.textInputStyles}
-                            value={inputAddress}
-                            onChange={handleAddressChange}
-                            placeholder="Enter the full address"
-                            variant="outlined"
-                            aria-label="Enter the address"
-                            InputProps={{
-                                classes: {
-                                    input: `${classes.searchInputStyles}
+                            <Typography
+                                component="h2"
+                                className={classes.titleStyles}
+                            >
+                                Address
+                            </Typography>
+                            <Typography
+                                component="h4"
+                                className={classes.subTitleStyles}
+                            >
+                                Enter the address of the production location. We
+                                will use this to plot the location on a map.
+                            </Typography>
+                            <TextField
+                                id="address"
+                                className={classes.textInputStyles}
+                                value={inputAddress}
+                                onChange={handleAddressChange}
+                                placeholder="Enter the full address"
+                                variant="outlined"
+                                aria-label="Enter the address"
+                                InputProps={{
+                                    classes: {
+                                        input: `${classes.searchInputStyles}
                                 ${
                                     addressTouched &&
                                     isEmpty(inputAddress) &&
                                     classes.errorStyle
                                 }`,
-                                    notchedOutline:
-                                        classes.notchedOutlineStyles,
-                                },
-                            }}
-                            helperText={
-                                addressTouched &&
-                                isEmpty(inputAddress) && <InputErrorText />
-                            }
-                            FormHelperTextProps={{
-                                className: classes.helperText,
-                            }}
-                            error={addressTouched && isEmpty(inputAddress)}
-                        />
-                    </div>
-                    <div
-                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                    >
-                        <Typography
-                            component="h2"
-                            className={classes.titleStyles}
-                        >
-                            Country
-                        </Typography>
-                        <Typography
-                            component="h4"
-                            className={classes.subTitleStyles}
+                                        notchedOutline:
+                                            classes.notchedOutlineStyles,
+                                    },
+                                }}
+                                helperText={
+                                    addressTouched &&
+                                    isEmpty(inputAddress) && <InputErrorText />
+                                }
+                                FormHelperTextProps={{
+                                    className: classes.helperText,
+                                }}
+                                error={addressTouched && isEmpty(inputAddress)}
+                            />
+                        </div>
+                        <div
+                            className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                         >
-                            Select the country where the production site is
-                            located.
-                        </Typography>
-                        <StyledSelect
-                            id="country"
-                            name="Country"
-                            aria-label="Country"
-                            options={countriesOptions || []}
-                            value={inputCountry}
-                            onChange={setInputCountry}
-                            className={classes.selectStyles}
-                            styles={selectStyles}
-                            placeholder="Country"
-                            isMulti={false}
-                        />
-                    </div>
-                    <hr className={classes.separator} />
-                    <div
-                        className={`${classes.sectionWrapStyles} ${classes.wrapStyles}`}
-                    >
-                        <div className={classes.rowContainerStyles}>
                             <Typography
                                 component="h2"
-                                className={`${classes.titleStyles} ${classes.marginRight}`}
+                                className={classes.titleStyles}
+                            >
+                                Country
+                            </Typography>
+                            <Typography
+                                component="h4"
+                                className={classes.subTitleStyles}
                             >
-                                Additional information
+                                Select the country where the production site is
+                                located.
                             </Typography>
-                            <IconButton onClick={toggleExpand}>
-                                {isExpanded ? (
-                                    <ArrowDropUpIcon />
-                                ) : (
-                                    <ArrowDropDownIcon />
-                                )}
-                            </IconButton>
+                            <StyledSelect
+                                id="country"
+                                name="Country"
+                                aria-label="Country"
+                                options={countriesOptions || []}
+                                value={inputCountry}
+                                onChange={setInputCountry}
+                                className={classes.selectStyles}
+                                styles={selectStyles}
+                                placeholder="Country"
+                                isMulti={false}
+                            />
                         </div>
-                        <Typography
-                            component="h4"
-                            className={classes.subTitleStyles}
+                        <hr className={classes.separator} />
+                        <div
+                            className={`${classes.sectionWrapStyles} ${classes.wrapStyles}`}
                         >
-                            Expand this section to add more data about your
-                            production location, including product types, number
-                            of workers, parent company and more.
-                        </Typography>
-                        {isExpanded && (
-                            <>
-                                <div
-                                    className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                                >
-                                    <Typography
-                                        component="h2"
-                                        className={classes.titleStyles}
-                                    >
-                                        Sector(s)
-                                    </Typography>
-                                    <Typography
-                                        component="h4"
-                                        className={classes.subTitleStyles}
-                                    >
-                                        Select the sector(s) that this location
-                                        operates in. For example: Apparel,
-                                        Electronics, Renewable Energy.
-                                    </Typography>
-                                    <StyledSelect
-                                        id="sector"
-                                        name="sector"
-                                        aria-label="Select sector"
-                                        options={
-                                            mapDjangoChoiceTuplesToSelectOptions(
-                                                mockedSectors,
-                                            ) || []
-                                        }
-                                        value={sector}
-                                        onChange={setSector}
-                                        styles={selectStyles}
-                                        className={classes.selectStyles}
-                                        placeholder="Select sector(s)"
-                                    />
-                                </div>
-                                <div
-                                    className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
+                            <div className={classes.rowContainerStyles}>
+                                <Typography
+                                    component="h2"
+                                    className={`${classes.titleStyles} ${classes.marginRight}`}
                                 >
-                                    <Typography
-                                        component="h2"
-                                        className={classes.titleStyles}
+                                    Additional information
+                                </Typography>
+                                <IconButton onClick={toggleExpand}>
+                                    {isExpanded ? (
+                                        <ArrowDropUpIcon />
+                                    ) : (
+                                        <ArrowDropDownIcon />
+                                    )}
+                                </IconButton>
+                            </div>
+                            <Typography
+                                component="h4"
+                                className={classes.subTitleStyles}
+                            >
+                                Expand this section to add more data about your
+                                production location, including product types,
+                                number of workers, parent company and more.
+                            </Typography>
+                            {isExpanded && (
+                                <>
+                                    <div
+                                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                                     >
-                                        Product Type(s)
-                                    </Typography>
-                                    <Typography
-                                        component="h4"
-                                        className={classes.subTitleStyles}
+                                        <Typography
+                                            component="h2"
+                                            className={classes.titleStyles}
+                                        >
+                                            Sector(s)
+                                        </Typography>
+                                        <Typography
+                                            component="h4"
+                                            className={classes.subTitleStyles}
+                                        >
+                                            Select the sector(s) that this
+                                            location operates in. For example:
+                                            Apparel, Electronics, Renewable
+                                            Energy.
+                                        </Typography>
+                                        <StyledSelect
+                                            id="sector"
+                                            name="sector"
+                                            aria-label="Select sector"
+                                            options={
+                                                mapDjangoChoiceTuplesToSelectOptions(
+                                                    mockedSectors,
+                                                ) || []
+                                            }
+                                            value={sector}
+                                            onChange={setSector}
+                                            styles={selectStyles}
+                                            className={classes.selectStyles}
+                                            placeholder="Select sector(s)"
+                                        />
+                                    </div>
+                                    <div
+                                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                                     >
-                                        Enter the type of products produced at
-                                        this location. For example: Shirts,
-                                        Laptops, Solar Panels.
-                                    </Typography>
+                                        <Typography
+                                            component="h2"
+                                            className={classes.titleStyles}
+                                        >
+                                            Product Type(s)
+                                        </Typography>
+                                        <Typography
+                                            component="h4"
+                                            className={classes.subTitleStyles}
+                                        >
+                                            Enter the type of products produced
+                                            at this location. For example:
+                                            Shirts, Laptops, Solar Panels.
+                                        </Typography>
 
-                                    <StyledSelect
-                                        creatable
-                                        name="Product Type"
-                                        value={productType}
-                                        onChange={setProductType}
-                                        placeholder="Enter product type(s)"
-                                        aria-label="Enter product type(s)"
-                                        styles={selectStyles}
-                                        className={classes.selectStyles}
-                                        components={customSelectComponents}
-                                    />
-                                </div>
-                                <div
-                                    className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                                >
-                                    <Typography
-                                        component="h2"
-                                        className={classes.titleStyles}
-                                    >
-                                        Location Type(s)
-                                    </Typography>
-                                    <Typography
-                                        component="h4"
-                                        className={classes.subTitleStyles}
-                                    >
-                                        Select the location type(s) for this
-                                        production location. For example: Final
-                                        Product Assembly, Raw Materials
-                                        Production or Processing, Office/HQ.
-                                    </Typography>
-                                    <StyledSelect
-                                        id="location_type"
-                                        name="Location type"
-                                        aria-label="Location type"
-                                        options={mapFacilityTypeOptions(
-                                            facilityProcessingTypeOptions || [],
-                                            processingType || [],
-                                        )}
-                                        value={locationType}
-                                        onChange={setLocationType}
-                                        styles={selectStyles}
-                                        className={classes.selectStyles}
-                                        placeholder="Select location type(s)"
-                                    />
-                                </div>
-                                <div
-                                    className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                                >
-                                    <Typography
-                                        component="h2"
-                                        className={classes.titleStyles}
-                                    >
-                                        Processing Type(s)
-                                    </Typography>
-                                    <Typography
-                                        component="h4"
-                                        className={classes.subTitleStyles}
+                                        <StyledSelect
+                                            creatable
+                                            name="Product Type"
+                                            value={productType}
+                                            onChange={setProductType}
+                                            placeholder="Enter product type(s)"
+                                            aria-label="Enter product type(s)"
+                                            styles={selectStyles}
+                                            className={classes.selectStyles}
+                                            components={customSelectComponents}
+                                        />
+                                    </div>
+                                    <div
+                                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                                     >
-                                        Select the type of processing activities
-                                        that take place at this location. For
-                                        example: Printing, Tooling, Assembly.
-                                    </Typography>
-                                    <StyledSelect
-                                        id="processing_type"
-                                        name="Processing Type"
-                                        aria-label="Processing Type"
-                                        options={mapProcessingTypeOptions(
-                                            facilityProcessingTypeOptions || [],
-                                            locationType || [],
-                                        )}
-                                        value={processingType}
-                                        onChange={setProcessingType}
-                                        styles={selectStyles}
-                                        className={classes.selectStyles}
-                                    />
-                                </div>
-                                <div
-                                    className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                                >
-                                    <Typography
-                                        component="h2"
-                                        className={classes.titleStyles}
+                                        <Typography
+                                            component="h2"
+                                            className={classes.titleStyles}
+                                        >
+                                            Location Type(s)
+                                        </Typography>
+                                        <Typography
+                                            component="h4"
+                                            className={classes.subTitleStyles}
+                                        >
+                                            Select the location type(s) for this
+                                            production location. For example:
+                                            Final Product Assembly, Raw
+                                            Materials Production or Processing,
+                                            Office/HQ.
+                                        </Typography>
+                                        <StyledSelect
+                                            id="location_type"
+                                            name="Location type"
+                                            aria-label="Location type"
+                                            options={mapFacilityTypeOptions(
+                                                facilityProcessingTypeOptions ||
+                                                    [],
+                                                processingType || [],
+                                            )}
+                                            value={locationType}
+                                            onChange={setLocationType}
+                                            styles={selectStyles}
+                                            className={classes.selectStyles}
+                                            placeholder="Select location type(s)"
+                                        />
+                                    </div>
+                                    <div
+                                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                                     >
-                                        Number of Workers
-                                    </Typography>
-                                    <Typography
-                                        component="h4"
-                                        className={classes.subTitleStyles}
+                                        <Typography
+                                            component="h2"
+                                            className={classes.titleStyles}
+                                        >
+                                            Processing Type(s)
+                                        </Typography>
+                                        <Typography
+                                            component="h4"
+                                            className={classes.subTitleStyles}
+                                        >
+                                            Select the type of processing
+                                            activities that take place at this
+                                            location. For example: Printing,
+                                            Tooling, Assembly.
+                                        </Typography>
+                                        <StyledSelect
+                                            id="processing_type"
+                                            name="Processing Type"
+                                            aria-label="Processing Type"
+                                            options={mapProcessingTypeOptions(
+                                                facilityProcessingTypeOptions ||
+                                                    [],
+                                                locationType || [],
+                                            )}
+                                            value={processingType}
+                                            onChange={setProcessingType}
+                                            styles={selectStyles}
+                                            className={classes.selectStyles}
+                                        />
+                                    </div>
+                                    <div
+                                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                                     >
-                                        Enter a number or a range for the number
-                                        of people employed at the location. For
-                                        example: 100, 100-150.
-                                    </Typography>
-                                    <TextField
-                                        id="number_of_workers"
-                                        error={
-                                            !isValidNumberOfWorkers(
-                                                numberOfWorkers,
-                                            )
-                                        }
-                                        variant="outlined"
-                                        className={classes.textInputStyles}
-                                        value={numberOfWorkers}
-                                        onChange={e =>
-                                            setNumberOfWorkers(e.target.value)
-                                        }
-                                        placeholder="Enter the number of workers as a number or range"
-                                        helperText={
-                                            !isValidNumberOfWorkers(
-                                                numberOfWorkers,
-                                            ) && (
-                                                <InputErrorText text="Enter the number of workers as a number or range" />
-                                            )
-                                        }
-                                        FormHelperTextProps={{
-                                            className: classes.helperText,
-                                        }}
-                                        InputProps={{
-                                            classes: {
-                                                input: `
+                                        <Typography
+                                            component="h2"
+                                            className={classes.titleStyles}
+                                        >
+                                            Number of Workers
+                                        </Typography>
+                                        <Typography
+                                            component="h4"
+                                            className={classes.subTitleStyles}
+                                        >
+                                            Enter a number or a range for the
+                                            number of people employed at the
+                                            location. For example: 100, 100-150.
+                                        </Typography>
+                                        <TextField
+                                            id="number_of_workers"
+                                            error={
+                                                !isValidNumberOfWorkers(
+                                                    numberOfWorkers,
+                                                )
+                                            }
+                                            variant="outlined"
+                                            className={classes.textInputStyles}
+                                            value={numberOfWorkers}
+                                            onChange={e =>
+                                                setNumberOfWorkers(
+                                                    e.target.value,
+                                                )
+                                            }
+                                            placeholder="Enter the number of workers as a number or range"
+                                            helperText={
+                                                !isValidNumberOfWorkers(
+                                                    numberOfWorkers,
+                                                ) && (
+                                                    <InputErrorText text="Enter the number of workers as a number or range" />
+                                                )
+                                            }
+                                            FormHelperTextProps={{
+                                                className: classes.helperText,
+                                            }}
+                                            InputProps={{
+                                                classes: {
+                                                    input: `
                                             ${
                                                 !isValidNumberOfWorkers(
                                                     numberOfWorkers,
                                                 ) && classes.errorStyle
                                             }`,
-                                                notchedOutline:
-                                                    classes.notchedOutlineStyles,
-                                            },
-                                        }}
-                                        aria-label="Number of Workers"
-                                    />
-                                </div>
-                                <div
-                                    className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
-                                >
-                                    <Typography
-                                        component="h2"
-                                        className={classes.titleStyles}
-                                    >
-                                        Parent Company
-                                    </Typography>
-                                    <Typography
-                                        component="h4"
-                                        className={classes.subTitleStyles}
+                                                    notchedOutline:
+                                                        classes.notchedOutlineStyles,
+                                                },
+                                            }}
+                                            aria-label="Number of Workers"
+                                        />
+                                    </div>
+                                    <div
+                                        className={`${classes.inputSectionWrapStyles} ${classes.wrapStyles}`}
                                     >
-                                        Enter the company that holds majority
-                                        ownership for this production.
-                                    </Typography>
-                                    <StyledSelect
-                                        creatable
-                                        name="Parent company"
-                                        value={parentCompany}
-                                        onChange={setParentCompany}
-                                        placeholder="Enter the parent company"
-                                        aria-label="Parent company"
-                                        styles={selectStyles}
-                                        className={classes.selectStyles}
-                                        components={customSelectComponents}
-                                    />
-                                </div>
-                            </>
-                        )}
-                    </div>
-                    <div className={classes.buttonsContainerStyles}>
-                        <Button
-                            variant="outlined"
-                            onClick={() => history.goBack()}
-                            className={classes.goBackButtonStyles}
-                        >
-                            Go Back
-                        </Button>
-                        <Button
-                            color="secondary"
-                            variant="contained"
-                            onClick={() => {
-                                handleProductionLocation(inputData, osID);
-                            }}
-                            className={classes.submitButtonStyles}
-                        >
-                            {submitButtonText}
-                        </Button>
-                    </div>
-                </Paper>
+                                        <Typography
+                                            component="h2"
+                                            className={classes.titleStyles}
+                                        >
+                                            Parent Company
+                                        </Typography>
+                                        <Typography
+                                            component="h4"
+                                            className={classes.subTitleStyles}
+                                        >
+                                            Enter the company that holds
+                                            majority ownership for this
+                                            production.
+                                        </Typography>
+                                        <StyledSelect
+                                            creatable
+                                            name="Parent company"
+                                            value={parentCompany}
+                                            onChange={setParentCompany}
+                                            placeholder="Enter the parent company"
+                                            aria-label="Parent company"
+                                            styles={selectStyles}
+                                            className={classes.selectStyles}
+                                            components={customSelectComponents}
+                                        />
+                                    </div>
+                                </>
+                            )}
+                        </div>
+                        <div className={classes.buttonsContainerStyles}>
+                            <Button
+                                variant="outlined"
+                                onClick={() => history.goBack()}
+                                className={classes.goBackButtonStyles}
+                            >
+                                Go Back
+                            </Button>
+                            <Button
+                                color="secondary"
+                                variant="contained"
+                                onClick={() => {
+                                    handleProductionLocation(inputData, osID);
+                                }}
+                                className={classes.submitButtonStyles}
+                            >
+                                {submitButtonText}
+                            </Button>
+                        </div>
+                    </Paper>
+                )}
             </div>
             {showProductionLocationDialog &&
             (pendingModerationEventData?.cleaned_data ||
@@ -793,6 +818,8 @@ ProductionLocationInfo.defaultProps = {
     singleModerationEventItem: null,
     singleModerationEventItemFetching: false,
     singleModerationEventItemError: null,
+    singleProductionLocationFetching: false,
+    singleProductionLocationError: null,
 };
 
 ProductionLocationInfo.propTypes = {
@@ -811,11 +838,14 @@ ProductionLocationInfo.propTypes = {
     singleModerationEventItemError: array,
     fetchProductionLocation: func.isRequired,
     singleProductionLocationData: productionLocationPropType.isRequired,
+    singleProductionLocationFetching: bool,
+    singleProductionLocationError: array,
     submitMethod: string.isRequired,
     classes: object.isRequired,
     innerWidth: number.isRequired,
     handleCleanupContributionRecord: func.isRequired,
     handleResetPendingModerationEvent: func.isRequired,
+    handleResetSingleProductionLocation: func.isRequired,
 };
 
 const mapStateToProps = ({
@@ -829,7 +859,11 @@ const mapStateToProps = ({
             fetching: pendingModerationEventFetching,
             error: pendingModerationEventError,
         },
-        singleProductionLocation: { data: singleProductionLocationData },
+        singleProductionLocation: {
+            data: singleProductionLocationData,
+            fetching: singleProductionLocationFetching,
+            error: singleProductionLocationError,
+        },
     },
     dashboardContributionRecord: {
         singleModerationEvent: {
@@ -851,6 +885,8 @@ const mapStateToProps = ({
     singleModerationEventItemFetching,
     singleModerationEventItemError,
     singleProductionLocationData,
+    singleProductionLocationFetching,
+    singleProductionLocationError,
     innerWidth,
 });
 
@@ -871,6 +907,8 @@ function mapDispatchToProps(dispatch) {
             dispatch(cleanupContributionRecord()),
         handleResetPendingModerationEvent: () =>
             dispatch(resetPendingModerationEvent()),
+        handleResetSingleProductionLocation: () =>
+            dispatch(resetSingleProductionLocation()),
     };
 }