diff --git a/web/src/pages/SubmitPlus.tsx b/web/src/pages/SubmitPlus.tsx
index 0fa092437..c1a89dc45 100644
--- a/web/src/pages/SubmitPlus.tsx
+++ b/web/src/pages/SubmitPlus.tsx
@@ -656,9 +656,12 @@ function PlusSortSelector({
           <div className="flex items-center justify-evenly p-2">
             <Button
               variant="select"
+              disabled={!currentSort}
               onClick={() => {
-                setSelectedSort(`${currentSort}_${currentDir}`);
-                setOpen(false);
+                if (currentSort) {
+                  setSelectedSort(`${currentSort}_${currentDir}`);
+                  setOpen(false);
+                }
               }}
             >
               Apply