diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs b/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs
index 33ccb565271..faafbc80b07 100644
--- a/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs
+++ b/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs
@@ -256,12 +256,12 @@ public override void Open()
                         "SELECT quote($password);",
                         new SqliteParameter("$password", ConnectionOptions.Password));
                     this.ExecuteNonQuery("PRAGMA key = " + quotedPassword + ";");
-                }
 
-                if (SQLitePCLExtensions.EncryptionSupported() != false)
-                {
-                    // NB: Forces decryption. Throws when the key is incorrect.
-                    this.ExecuteNonQuery("SELECT COUNT(*) FROM sqlite_master;");
+                    if (SQLitePCLExtensions.EncryptionSupported() != false)
+                    {
+                        // NB: Forces decryption. Throws when the key is incorrect.
+                        this.ExecuteNonQuery("SELECT COUNT(*) FROM sqlite_master;");
+                    }
                 }
 
                 if (ConnectionOptions.ForeignKeys.HasValue)
diff --git a/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs b/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
index 06da6803436..582a59f2221 100644
--- a/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
+++ b/test/Microsoft.Data.Sqlite.Tests/SqliteConnectionTest.cs
@@ -5,11 +5,9 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.Data.Sqlite.Properties;
-using Microsoft.Data.Sqlite.Utilities;
 using Xunit;
 using static SQLitePCL.raw;
 
@@ -314,7 +312,7 @@ private void Open_works_when_password_supported()
                 // NB: The file is only encrypted after writing
                 connection1.ExecuteNonQuery("CREATE TABLE IF NOT EXISTS dual (dummy)");
 
-                using (var connection2 = new SqliteConnection("Data Source=encrypted.db"))
+                using (var connection2 = new SqliteConnection("Data Source=encrypted.db;Password=wrong"))
                 {
                     var stateChangeRaised = false;
                     connection2.StateChange += (sender, e) => stateChangeRaised = true;
@@ -334,6 +332,34 @@ private void Open_works_when_password_might_be_supported()
             connection.Open();
         }
 
+#if E_SQLCIPHER || SQLCIPHER
+        [Fact]
+        public void Open_decrypts_lazily_when_no_password()
+        {
+            try
+            {
+                using var connection1 = new SqliteConnection("Data Source=encrypted2.db;Password=password");
+                connection1.Open();
+
+                // NB: The file is only encrypted after writing
+                connection1.ExecuteNonQuery(
+                    "CREATE TABLE IF NOT EXISTS data (value); INSERT INTO data (value) VALUES (1);");
+
+                using var connection2 = new SqliteConnection("Data Source=encrypted2.db");
+                connection2.Open();
+                connection2.ExecuteNonQuery("PRAGMA key = 'password';");
+
+                var value = connection2.ExecuteScalar<long>("SELECT value FROM data;");
+
+                Assert.Equal(1L, value);
+            }
+            finally
+            {
+                File.Delete("encrypted2.db");
+            }
+        }
+#endif
+
         [Theory]
         [InlineData("True", 1L)]
         [InlineData("False", 0L)]