diff --git a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs
index 11ec9b5b8..1da59cf59 100644
--- a/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs
+++ b/XenAdmin/Wizards/RollingUpgradeWizard/RollingUpgradeWizardPrecheckPage.cs
@@ -204,7 +204,8 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
                 checkGroup = checks[checks.Count - 1].Value;
                 foreach (Host host in SelectedServers)
                 {
-                    checkGroup.Add(new HostHasUnsupportedStorageLinkSRCheck(host));
+                    if(!Helpers.CreedenceOrGreater(host))
+                        checkGroup.Add(new HostHasUnsupportedStorageLinkSRCheck(host));
                 }
             }
 
@@ -219,7 +220,8 @@ namespace XenAdmin.Wizards.RollingUpgradeWizard
                     checkGroup = checks[checks.Count - 1].Value;
                     foreach (Host host in SelectedServers)
                     {
-                        checkGroup.Add(new UpgradingFromTampaAndOlderCheck(host));
+                        if(!Helpers.ClearwaterOrGreater(host))
+                            checkGroup.Add(new UpgradingFromTampaAndOlderCheck(host));
                     }
                 }