diff --git a/MatterControlLib/ApplicationView/PrinterModels.cs b/MatterControlLib/ApplicationView/PrinterModels.cs
index 2803a8127..f481ef010 100644
--- a/MatterControlLib/ApplicationView/PrinterModels.cs
+++ b/MatterControlLib/ApplicationView/PrinterModels.cs
@@ -208,8 +208,8 @@ namespace MatterHackers.MatterControl
 				new EditContext()
 				{
 					SourceItem = libraryItem,
-					// No content store for GCode, otherwise PlatingHistory
-					ContentStore = this.EditContext.ContentStore
+					// No content store for GCode
+					ContentStore = null
 				});
 
 			// Slice and print
@@ -613,7 +613,7 @@ namespace MatterHackers.MatterControl
 				ApplicationController.Instance.Thumbnails.DeleteCache(this.SourceItem);
 
 				// Call save on the provider
-				this.ContentStore.Save(this.SourceItem, this.Content);
+				this.ContentStore?.Save(this.SourceItem, this.Content);
 			}
 		}
 	}
diff --git a/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs b/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
index 1279146bc..d143146e4 100644
--- a/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
+++ b/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
@@ -569,8 +569,8 @@ namespace MatterHackers.MatterControl.PrintLibrary
 							new EditContext()
 							{
 								SourceItem = assetStream,
-								// No content store for GCode, otherwise PlatingHistory
-								ContentStore = printer.Bed.EditContext.ContentStore
+								// No content store for GCode
+								ContentStore = null
 							}).ConfigureAwait(false);
 					}
 					else
diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
index 42840e5d0..c72dabe02 100644
--- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
@@ -607,8 +607,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 							new EditContext()
 							{
 								SourceItem = this.SceneReplacement,
-								// No content store for GCode, otherwise PlatingHistory
-								ContentStore = sceneContext.EditContext.ContentStore
+								// No content store for GCode
+								ContentStore = null
 							}).ConfigureAwait(false);
 
 						this.SceneReplacement = null;