diff --git a/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx
index b96073146403..5adb2a673a20 100644
--- a/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx
+++ b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx
@@ -8,68 +8,21 @@ import {
 } from '@island.is/island-ui/core'
 import { useLocale, useNamespaces } from '@island.is/localization'
 import {
-  FootNote,
-  IntroHeader,
+  EmptyTable,
   IntroWrapper,
   LinkButton,
   amountFormat,
   m as coreMessages,
 } from '@island.is/portals/my-pages/core'
 import { m } from '../../lib/messages'
-import {
-  useGetIncomePlanDetailLazyQuery,
-  useGetIncomePlanDetailQuery,
-} from './IncomePlanDetail.generated'
+import { useGetIncomePlanDetailQuery } from './IncomePlanDetail.generated'
 import { Problem } from '@island.is/react-spa/shared'
-import { useEffect, useState } from 'react'
-import { useFeatureFlagClient } from '@island.is/react/feature-flags'
 
 const IncomePlanDetail = () => {
   useNamespaces('sp.social-insurance-maintenance')
   const { formatMessage } = useLocale()
 
-  const [displayPaymentPlan, setDisplayPaymentPlan] = useState(false)
-  const [query, { data, loading, error }] = useGetIncomePlanDetailLazyQuery()
-
-  const featureFlagClient = useFeatureFlagClient()
-  useEffect(() => {
-    const isFlagEnabled = async () => {
-      const ffEnabled = await featureFlagClient.getValue(
-        `isServicePortalPaymentPlan2025Enabled`,
-        false,
-      )
-      if (ffEnabled) {
-        setDisplayPaymentPlan(ffEnabled as boolean)
-      }
-    }
-    isFlagEnabled()
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  useEffect(() => {
-    if (displayPaymentPlan) {
-      query()
-    }
-  }, [displayPaymentPlan])
-
-  if (!displayPaymentPlan) {
-    return (
-      <IntroWrapper
-        title={formatMessage(coreMessages.latestIncomePlan)}
-        intro={formatMessage(m.incomePlanDetail)}
-        serviceProviderSlug={'tryggingastofnun'}
-        serviceProviderTooltip={formatMessage(
-          coreMessages.socialInsuranceTooltip,
-        )}
-      >
-        <AlertMessage
-          type="warning"
-          message={formatMessage(m.incomePlanTemporarilyUnavailable)}
-        />
-      </IntroWrapper>
-    )
-  }
-
+  const { data, loading, error } = useGetIncomePlanDetailQuery()
   return (
     <IntroWrapper
       title={formatMessage(coreMessages.latestIncomePlan)}
diff --git a/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx
index fd05bd116943..54414a12a609 100644
--- a/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx
+++ b/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx
@@ -28,6 +28,7 @@ const PaymentPlan = () => {
   const [query, { data, loading, error }] = useGetPreviousPaymentsLazyQuery()
 
   const featureFlagClient = useFeatureFlagClient()
+
   useEffect(() => {
     const isFlagEnabled = async () => {
       const ffEnabled = await featureFlagClient.getValue(