diff --git a/components/openEdition/MintingDetails.tsx b/components/openEdition/MintingDetails.tsx
index c18bcb1..622489a 100644
--- a/components/openEdition/MintingDetails.tsx
+++ b/components/openEdition/MintingDetails.tsx
@@ -17,7 +17,7 @@ import { useWallet } from 'utils/wallet'
 import { NumberInput, TextInput } from '../forms/FormInput'
 import type { UploadMethod } from './OffChainMetadataUploadDetails'
 
-export type LimitType = 'count_limited' | 'time_limited'
+export type LimitType = 'count_limited' | 'time_limited' | 'time_and_count_limited'
 
 interface MintingDetailsProps {
   onChange: (data: MintingDetailsDataProps) => void
@@ -113,11 +113,19 @@ export const MintingDetails = ({
         : '',
       perAddressLimit: perAddressLimitState.value,
       startTime: timestamp ? (timestamp.getTime() * 1_000_000).toString() : '',
-      endTime: endTimestamp ? (endTimestamp.getTime() * 1_000_000).toString() : '',
+      endTime:
+        limitType === 'time_limited' || limitType === 'time_and_count_limited'
+          ? endTimestamp
+            ? (endTimestamp.getTime() * 1_000_000).toString()
+            : ''
+          : undefined,
       paymentAddress: paymentAddressState.value.trim(),
       selectedMintToken,
       limitType,
-      tokenCountLimit: limitType === 'count_limited' ? tokenCountLimitState.value : undefined,
+      tokenCountLimit:
+        limitType === 'count_limited' || limitType === 'time_and_count_limited'
+          ? tokenCountLimitState.value
+          : undefined,
     }
     onChange(data)
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -208,10 +216,12 @@ export const MintingDetails = ({
           <label className="justify-start ml-6 cursor-pointer label">
             <span className="mr-2">Time</span>
             <input
-              checked={limitType === 'time_limited'}
+              checked={limitType === 'time_limited' || limitType === 'time_and_count_limited'}
               className={`${limitType === 'time_limited' ? `bg-stargaze` : `bg-gray-600`} checkbox`}
               onClick={() => {
-                setLimitType('time_limited' as LimitType)
+                if (limitType === 'time_and_count_limited') setLimitType('count_limited' as LimitType)
+                else if (limitType === 'count_limited') setLimitType('time_and_count_limited' as LimitType)
+                else setLimitType('count_limited' as LimitType)
               }}
               type="checkbox"
             />
@@ -219,16 +229,18 @@ export const MintingDetails = ({
           <label className="justify-start ml-4 cursor-pointer label">
             <span className="mr-2">Token Count</span>
             <input
-              checked={limitType === 'count_limited'}
+              checked={limitType === 'count_limited' || limitType === 'time_and_count_limited'}
               className={`${limitType === 'count_limited' ? `bg-stargaze` : `bg-gray-600`} checkbox`}
               onClick={() => {
-                setLimitType('count_limited' as LimitType)
+                if (limitType === 'time_and_count_limited') setLimitType('time_limited' as LimitType)
+                else if (limitType === 'time_limited') setLimitType('time_and_count_limited' as LimitType)
+                else setLimitType('time_limited' as LimitType)
               }}
               type="checkbox"
             />
           </label>
         </div>
-        <Conditional test={limitType === 'time_limited'}>
+        <Conditional test={limitType === 'time_limited' || limitType === 'time_and_count_limited'}>
           <FormControl
             htmlId="endTimestamp"
             isRequired
@@ -258,7 +270,7 @@ export const MintingDetails = ({
             />
           </FormControl>
         </Conditional>
-        <Conditional test={limitType === 'count_limited'}>
+        <Conditional test={limitType === 'count_limited' || limitType === 'time_and_count_limited'}>
           <NumberInput {...tokenCountLimitState} isRequired />
         </Conditional>
       </FormGroup>
diff --git a/components/openEdition/OpenEditionMinterCreator.tsx b/components/openEdition/OpenEditionMinterCreator.tsx
index 6583842..fa7ff48 100644
--- a/components/openEdition/OpenEditionMinterCreator.tsx
+++ b/components/openEdition/OpenEditionMinterCreator.tsx
@@ -849,14 +849,21 @@ export const OpenEditionMinterCreator = ({
                 : null,
           },
           start_time: mintingDetails?.startTime,
-          end_time: mintingDetails?.limitType === ('time_limited' as LimitType) ? mintingDetails.endTime : null,
+          end_time:
+            mintingDetails?.limitType === ('time_limited' as LimitType) ||
+            mintingDetails?.limitType === ('time_and_count_limited' as LimitType)
+              ? mintingDetails.endTime
+              : null,
           mint_price: {
             amount: Number(mintingDetails?.unitPrice).toString(),
             denom: (mintTokenFromFactory?.denom as string) || 'ustars',
           },
           per_address_limit: mintingDetails?.perAddressLimit,
           num_tokens:
-            mintingDetails?.limitType === ('count_limited' as LimitType) ? mintingDetails.tokenCountLimit : null,
+            mintingDetails?.limitType === ('count_limited' as LimitType) ||
+            mintingDetails?.limitType === ('time_and_count_limited' as LimitType)
+              ? mintingDetails.tokenCountLimit
+              : null,
           payment_address: mintingDetails?.paymentAddress || null,
           whitelist,
         },