diff --git a/game/screens.rpy b/game/screens.rpy
index 9bdd583..4f9622d 100644
--- a/game/screens.rpy
+++ b/game/screens.rpy
@@ -9,7 +9,7 @@ init python:
     
  def UpdateCheck():
   pendingVersion = updater.UpdateVersion(persistent.updateWebServer)
-  if pendingVersion == None:
+  if pendingVersion == None or pendingVersion == config.version or "TEST" in pendingVersion:
     persistent.updateresult = "No new version is available"
   else:
     persistent.updateresult = pendingVersion
@@ -738,7 +738,10 @@ screen updates():
         textbutton _("Check for Update!") action [Notify("Checking for update..."), Function(UpdateCheck)]
         label _("Update Check Result:\n")
         text _("[persistent.updateresult!t]\n")
-        textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=True)
+        if persistent.updateresult != "No new version is available":
+            textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=False)
+        else:
+            textbutton _("Update Now!") action Notify("Nothing to update to!")
         textbutton "Back to Extras" action ShowMenu("extras")
     vbox:
         xpos 1942