diff --git a/components/PropertyMap.jsx b/components/PropertyMap.jsx
index 8ea7d79..9a789cb 100644
--- a/components/PropertyMap.jsx
+++ b/components/PropertyMap.jsx
@@ -5,6 +5,7 @@ import Map, { Marker } from 'react-map-gl';
 import { setDefaults, fromAddress } from 'react-geocode';
 import Image from 'next/image';
 import pin from '@/assets/images/pin.svg';
+import Spinner from './Spinner';
 
 const PropertyMap = ({ property }) => {
   const [lat, setLat] = useState(null);
@@ -61,7 +62,7 @@ const PropertyMap = ({ property }) => {
     fetchCoords();
   }, []);
 
-  if (loading) return <h3>Loading...</h3>;
+  if (loading) return <Spinner loading={loading} />;
 
   if (geocodeError) {
     return <div className='text-xl'>No location data found</div>;
diff --git a/components/Spinner.jsx b/components/Spinner.jsx
new file mode 100644
index 0000000..9f58d25
--- /dev/null
+++ b/components/Spinner.jsx
@@ -0,0 +1,20 @@
+'use client';
+import ClipLoader from 'react-spinners/ClipLoader';
+
+const override = {
+  display: 'block',
+  margin: '100px auto',
+};
+
+const Spinner = ({ loading }) => {
+  return (
+    <ClipLoader
+      color='#3b82f6'
+      loading={loading}
+      cssOverride={override}
+      size={150}
+      aria-label='Loading Spinner'
+    />
+  );
+};
+export default Spinner;