diff --git a/src/Spe/Core/Data/DisablePropertyExpander.cs b/src/Spe/Core/Data/DisablePropertyExpander.cs
new file mode 100644
index 000000000..58ff21d34
--- /dev/null
+++ b/src/Spe/Core/Data/DisablePropertyExpander.cs
@@ -0,0 +1,9 @@
+using Sitecore.Common;
+
+namespace Spe.Core.Data
+{
+    public class DisablePropertyExpander : Switcher<bool, DisablePropertyExpander>
+    {
+        public DisablePropertyExpander() : base(true) { }
+    }
+}
\ No newline at end of file
diff --git a/src/Spe/Core/Extensions/ItemShellExtensions.cs b/src/Spe/Core/Extensions/ItemShellExtensions.cs
index 23d3f552c..29185b186 100644
--- a/src/Spe/Core/Extensions/ItemShellExtensions.cs
+++ b/src/Spe/Core/Extensions/ItemShellExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
+using Sitecore.Common;
 using Sitecore.Data;
 using Sitecore.Data.Events;
 using Sitecore.Data.Fields;
@@ -9,6 +10,7 @@
 using Sitecore.Diagnostics;
 using Sitecore.Events;
 using Sitecore.Resources.Media;
+using Spe.Core.Data;
 using Spe.Core.Settings;
 
 namespace Spe.Core.Extensions
@@ -34,6 +36,8 @@ internal static PSObject GetPsObject(SessionState provider, Item item)
         {
             var psObject = PSObject.AsPSObject(item);
 
+            if (Switcher<bool, DisablePropertyExpander>.CurrentValue) return psObject;
+
             Dictionary<ID, string> propertySet;
             if (AllPropertySets.ContainsKey(item.TemplateID))
             {
diff --git a/src/Spe/Spe.csproj b/src/Spe/Spe.csproj
index 479d11217..f469b3bbd 100644
--- a/src/Spe/Spe.csproj
+++ b/src/Spe/Spe.csproj
@@ -214,6 +214,7 @@
     <Compile Include="Commands\Presentation\AddPlaceholderSettingCommand.cs" />
     <Compile Include="Commands\Presentation\NewPlaceholderSettingCommand.cs" />
     <Compile Include="Commands\Security\Accounts\BaseSecurityCommand.cs" />
+    <Compile Include="Core\Data\DisablePropertyExpander.cs" />
     <Compile Include="Core\Extensions\CustomFieldAccessor.cs" />
     <Compile Include="Core\Extensions\ExpressionExtensions.cs" />
     <Compile Include="Core\Extensions\EnumerableExtensions.cs" />