diff --git a/src/components/Konnector/KonnectorViewerCard.tsx b/src/components/Konnector/KonnectorViewerCard.tsx
index e7eb4d22f22857d62b4040cc790466a26acc378c..27012b98af89873f8bdcb09bfc41b011d8b4db79 100644
--- a/src/components/Konnector/KonnectorViewerCard.tsx
+++ b/src/components/Konnector/KonnectorViewerCard.tsx
@@ -249,11 +249,13 @@ const KonnectorViewerCard = ({
         </Button>
       )
     }
+
     if (fluidState === FluidState.KONNECTOR_NOT_FOUND && !isUpdating) {
       return <ConnectionNotFound konnectorSlug={fluidSlug} />
     }
+
     // Handle login failed for EGL
-    else if (
+    if (
       (fluidType === FluidType.WATER &&
         fluidState === FluidState.LOGIN_FAILED) ||
       (account && currentFluidStatus.status !== FluidState.NOT_CONNECTED)
@@ -262,12 +264,11 @@ const KonnectorViewerCard = ({
         <ConnectionResult
           handleAccountDeletion={handleAccountDeletion}
           fluidType={fluidType}
-          key={lastDataDate}
         />
       )
-    } else {
-      return <Connection fluidType={currentFluidStatus.fluidType} />
     }
+
+    return <Connection fluidType={currentFluidStatus.fluidType} />
   }, [
     account,
     currentFluidStatus.fluidType,
@@ -277,7 +278,6 @@ const KonnectorViewerCard = ({
     fluidType,
     handleAccountDeletion,
     isUpdating,
-    lastDataDate,
     showOfflineData,
     t,
     toggleModalConnection,
@@ -312,7 +312,8 @@ const KonnectorViewerCard = ({
     ]
   )
 
-  const getIconForStatus = (
+  /** Return maintenance, error or warning status icon */
+  const getStatusIcon = (
     status: FluidState,
     maintenance: boolean,
     connection: FluidConnection,
@@ -359,7 +360,7 @@ const KonnectorViewerCard = ({
           icon={currentFluidStatus.connection.account ? iconType : OfflinePicto}
           size={49}
         />
-        {getIconForStatus(
+        {getStatusIcon(
           currentFluidStatus.status,
           currentFluidStatus.maintenance,
           currentFluidStatus.connection,