diff --git a/frontend/src/components/puzzles/PuzzleSubmit.tsx b/frontend/src/components/puzzles/PuzzleSubmit.tsx
index 6b8691f..08b4e15 100644
--- a/frontend/src/components/puzzles/PuzzleSubmit.tsx
+++ b/frontend/src/components/puzzles/PuzzleSubmit.tsx
@@ -93,8 +93,9 @@ export function PuzzleSubmit({
   );
 
   const renderStatusMessage = () => {
-    // Don't show any status message if we have a validation result
-    if (validationResult) {
+    // Don't show any status message if we have a valid solution
+    // this is needed to avoid showing "Solution submitted successfully!" and "Puzzle already completed"
+    if (validationResult && validationResult.isValid) {
       return null;
     }