diff --git a/components/hackathons/submissions/SubmissionForm.tsx b/components/hackathons/submissions/SubmissionForm.tsx
index abb2e0e4f..3c48a5347 100644
--- a/components/hackathons/submissions/SubmissionForm.tsx
+++ b/components/hackathons/submissions/SubmissionForm.tsx
@@ -1081,15 +1081,17 @@ const SubmissionFormContent: React.FC<SubmissionFormContentProps> = ({
           <div key='step-1' className='space-y-6'>
             <div className='flex items-center justify-between'>
               <div></div>
-              <Button
-                type='button'
-                variant='outline'
-                size='sm'
-                onClick={handleFillMockData}
-                className='border-gray-600 text-gray-300 hover:bg-gray-700 hover:text-white'
-              >
-                Fill with Mock Data
-              </Button>
+              {process.env.NODE_ENV === 'development' && (
+                <Button
+                  type='button'
+                  variant='outline'
+                  size='sm'
+                  onClick={handleFillMockData}
+                  className='border-gray-600 text-gray-300 hover:bg-gray-700 hover:text-white'
+                >
+                  Fill with Mock Data
+                </Button>
+              )}
             </div>
             <FormField
               control={form.control}
diff --git a/components/hackathons/submissions/submissionTab.tsx b/components/hackathons/submissions/submissionTab.tsx
index bf4da83e9..61f17bec7 100644
--- a/components/hackathons/submissions/submissionTab.tsx
+++ b/components/hackathons/submissions/submissionTab.tsx
@@ -267,7 +267,8 @@ const SubmissionTabContent: React.FC<SubmissionTabContentProps> = ({
       {!isLoadingMySubmission &&
         !mySubmission &&
         isAuthenticated &&
-        isRegistered && (
+        isRegistered &&
+        status !== 'upcoming' && (
           <div className='mb-8 rounded-lg border border-dashed border-gray-700 bg-gray-800/20 p-8 text-center'>
             <p className='mb-4 text-gray-400'>
               You haven't submitted a project yet.