diff --git a/Projects/Simba/simbaunit.pas b/Projects/Simba/simbaunit.pas
index 1f4bb92..0880749 100644
--- a/Projects/Simba/simbaunit.pas
+++ b/Projects/Simba/simbaunit.pas
@@ -883,7 +883,10 @@ end;
 
 procedure TSimbaForm.UpdateMenuButtonClick(Sender: TObject);
 begin
-  SimbaUpdateForm.ShowModal;
+  if SimbaUpdateForm.CanUpdate then
+    SimbaUpdateForm.ShowModal
+  else
+    ShowMessage('No Updates Available!');
 end;
 
 procedure ClearDebug;
diff --git a/Projects/Simba/updateform.pas b/Projects/Simba/updateform.pas
index 7a2eb12..c38d1bd 100644
--- a/Projects/Simba/updateform.pas
+++ b/Projects/Simba/updateform.pas
@@ -162,7 +162,7 @@ begin
   Self.DownloadSpeed.Visible := false;
   if not CanUpdate then
   begin
-    ShowMessage('No Updates Available!');
+    //ShowMessage('No Updates Available!');
     Self.UpdateLog.Lines.Add('No Updates Available!');
     Self.UpdateButton.Enabled := False;
   end else