diff --git a/src/components/solution-control/solution-control.tsx b/src/components/solution-control/solution-control.tsx
index 0c4823365..1637dc700 100644
--- a/src/components/solution-control/solution-control.tsx
+++ b/src/components/solution-control/solution-control.tsx
@@ -61,12 +61,16 @@ export const SolutionControl = ({
 
   const onModifyDialog = () => {
     closeModifyDialog()
-    modifyDialog.solutionName && onModify(modifyDialog.solutionName)
+    if (modifyDialog.solutionName) {
+      onModify(modifyDialog.solutionName)
+    }
   }
 
   const onDeleteDialog = () => {
     closeDeleteDialog()
-    deleteDialog.solutionName && onDelete(deleteDialog.solutionName)
+    if (deleteDialog.solutionName) {
+      onDelete(deleteDialog.solutionName)
+    }
   }
 
   const onCreateDialog = (solutionName: string) => {