diff --git a/SampleApplications/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs b/SampleApplications/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
index 0cb04aeb1d..739574eeb9 100644
--- a/SampleApplications/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
+++ b/SampleApplications/Samples/GDS/Client/Controls/ApplicationCertificateControl.cs
@@ -182,7 +182,7 @@ namespace Opc.Ua.GdsClient
                     if (m_certificate != null &&
                         m_certificate.HasPrivateKey)
                     {
-                        m_certificate = await id.LoadPrivateKey(string.Empty);
+                        m_certificate = await id.LoadPrivateKey(m_certificatePassword);
                     }
                 }
 
diff --git a/SampleApplications/Samples/GDS/Common/ServerPushConfigurationInterface.cs b/SampleApplications/Samples/GDS/Common/ServerPushConfigurationInterface.cs
index 13aee7523e..f60df5a610 100644
--- a/SampleApplications/Samples/GDS/Common/ServerPushConfigurationInterface.cs
+++ b/SampleApplications/Samples/GDS/Common/ServerPushConfigurationInterface.cs
@@ -314,6 +314,11 @@ namespace Opc.Ua.Gds
         /// <exception cref="System.InvalidOperationException">Connection to server is not active.</exception>
         public string[] GetSupportedKeyFormats()
         {
+            if (AdminCredentials == null || Endpoint == null)
+            {
+                return null;
+            }
+
             if (!IsConnected)
             {
                 Connect();