diff --git a/frontend/src/components/metrics/ServicesTable.tsx b/frontend/src/components/metrics/ServicesTable.tsx
index 725d2c0cb0..d2b4cf75db 100644
--- a/frontend/src/components/metrics/ServicesTable.tsx
+++ b/frontend/src/components/metrics/ServicesTable.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { useLocation } from "react-router-dom";
 import { NavLink } from "react-router-dom";
-import { Table } from "antd";
+import { Spin, Table } from "antd";
 import styled from "styled-components";
 import { connect } from "react-redux";
 
@@ -30,6 +30,16 @@ const Wrapper = styled.div`
 	}
 `;
 
+const TableLoadingWrapper = styled.div`
+		display: flex;
+		justify-content: center;
+		margin-top: 80px;
+`
+
+const LoadingText = styled.div`
+		margin-left: 16px;
+`
+
 const columns = [
 	{
 		title: "Application",
@@ -72,9 +82,22 @@ const _ServicesTable = (props: ServicesTableProps) => {
 	const time_interval = new URLSearchParams(search).get("time");
 
 	useEffect(() => {
+		/*
+			@Note - Change this from action to thunk
+		 */
 		props.getServicesList(props.globalTime);
 	}, [props.globalTime]);
 
+	const isDataAvailable = props.servicesList.length > 1;
+	if(!isDataAvailable){
+		return (
+				<TableLoadingWrapper>
+					<Spin/>
+					<LoadingText>Fetching data</LoadingText>
+				</TableLoadingWrapper>
+		)
+	}
+
 	return (
 		<Wrapper>
 			<Table