diff --git a/.env b/.env
index 9643b21..b05c9a4 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-REACT_APP_API_LOCAL=http://localhost:5000/
-REACT_APP_API_PROD=https://api.wheelshare.app/
+REACT_APP_API_PROD=http://localhost:5000/
+REACT_APP_API_LOCAL=https://api.wheelshare.app/
diff --git a/src/components/ActiveCarpools/ActiveCarpools.tsx b/src/components/ActiveCarpools/ActiveCarpools.tsx
index ccc24f3..e4f26ae 100644
--- a/src/components/ActiveCarpools/ActiveCarpools.tsx
+++ b/src/components/ActiveCarpools/ActiveCarpools.tsx
@@ -30,9 +30,9 @@ export default function ActiveCarpools() {
 		>
 			<h1 style={{ textAlign: 'center' }}>Carpools</h1>
 			<UISecondaryBox style={{ width: '100%', boxSizing: 'border-box' }}>
-				{activeCarpools.map((carpool) => (
+				{activeCarpools.length > 0 ? activeCarpools.map((carpool) => (
 					<ActiveCarpoolListItem carpool={carpool} key={carpool.id} />
-				))}
+				)) : "No Carpools"}
 			</UISecondaryBox>
 		</div>
 	);
diff --git a/src/components/Event/EventCarpools.tsx b/src/components/Event/EventCarpools.tsx
index 6e0a736..c798765 100644
--- a/src/components/Event/EventCarpools.tsx
+++ b/src/components/Event/EventCarpools.tsx
@@ -145,13 +145,13 @@ export default function Carpools() {
 				Click <EmojiPeopleIcon style={{ fontSize: '0.875rem' }} /> to request to
 				join a carpool.
 			</span>
-			{event.carpools.map((carpool) => (
+			{event.carpools.length>0 ? event.carpools.map((carpool) => (
 				<CarpoolRow
 					carpool={carpool}
 					key={carpool.id}
 					inCarpoolAlready={alreadyInCarpool}
 				/>
-			))}
+			)) : "No Carpools"}
 		</div>
 	);
 }