diff --git a/Greenshot/Helpers/UpdateHelper.cs b/Greenshot/Helpers/UpdateHelper.cs
index 9fcf16bb3..6c8d2b178 100644
--- a/Greenshot/Helpers/UpdateHelper.cs
+++ b/Greenshot/Helpers/UpdateHelper.cs
@@ -137,7 +137,7 @@ namespace Greenshot.Experimental {
 						// the current version is a release or release candidate AND check unstable is turned off.
 						if (rssFile.isUnstable) {
 							// Skip if we shouldn't check unstables
-							if ((conf.BuildState == BuildStates.RELEASE || conf.BuildState == BuildStates.RELEASE_CANDIDATE) && !conf.CheckForUnstable) {
+							if ((conf.BuildState == BuildStates.RELEASE) && !conf.CheckForUnstable) {
 								continue;
 							}
 						}
diff --git a/GreenshotPlugin/Core/CoreConfiguration.cs b/GreenshotPlugin/Core/CoreConfiguration.cs
index 87e3e539d..20155b965 100644
--- a/GreenshotPlugin/Core/CoreConfiguration.cs
+++ b/GreenshotPlugin/Core/CoreConfiguration.cs
@@ -254,7 +254,7 @@ namespace GreenshotPlugin.Core {
 		public bool ProcessEXIFOrientation;
 
 		// Specifies what THIS build is
-		public BuildStates BuildState = BuildStates.RELEASE;
+		public BuildStates BuildState = Assembly.GetExecutingAssembly().GetName().Version.Build % 2 == 0 ? BuildStates.UNSTABLE : BuildStates.RELEASE;
 
 		/// <summary>
 		/// A helper method which returns true if the supplied experimental feature is enabled