diff --git a/src/main/java/de/dafuqs/spectrum/api/energy/storage/FixedSingleInkStorage.java b/src/main/java/de/dafuqs/spectrum/api/energy/storage/FixedSingleInkStorage.java
index 2baa81920c..89acdf0a3f 100644
--- a/src/main/java/de/dafuqs/spectrum/api/energy/storage/FixedSingleInkStorage.java
+++ b/src/main/java/de/dafuqs/spectrum/api/energy/storage/FixedSingleInkStorage.java
@@ -17,14 +17,5 @@ public FixedSingleInkStorage(long maxEnergy, InkColor color, long amount) {
 	public boolean accepts(InkColor color) {
 		return this.storedColor == color;
 	}
-	
-	@Override
-	public long getRoom(InkColor color) {
-		if (this.storedColor == color) {
-			return this.maxEnergy - this.storedEnergy;
-		} else {
-			return 0;
-		}
-	}
-	
+
 }
\ No newline at end of file
diff --git a/src/main/java/de/dafuqs/spectrum/api/energy/storage/SingleInkStorage.java b/src/main/java/de/dafuqs/spectrum/api/energy/storage/SingleInkStorage.java
index 9edfd84506..fcf41b26e2 100644
--- a/src/main/java/de/dafuqs/spectrum/api/energy/storage/SingleInkStorage.java
+++ b/src/main/java/de/dafuqs/spectrum/api/energy/storage/SingleInkStorage.java
@@ -41,10 +41,11 @@ public boolean accepts(InkColor color) {
 	
 	@Override
 	public long addEnergy(InkColor color, long amount) {
-		if (color != storedColor && this.storedEnergy != 0)
+		if (color != storedColor && this.storedEnergy != 0 || !this.accepts(color))
 			return amount;
-		if (this.storedEnergy == 0)
+		if (this.storedEnergy == 0) {
 			this.storedColor = color;
+		}
 		long resultingAmount = this.storedEnergy + amount;
 		this.storedEnergy = resultingAmount;
 		if (resultingAmount > this.maxEnergy) {
@@ -138,7 +139,7 @@ public void addTooltip(List<Component> tooltip) {
 	
 	@Override
 	public long getRoom(InkColor color) {
-		if (this.storedEnergy == 0 || this.storedColor == color) {
+		if (this.accepts(color)) {
 			return this.maxEnergy - this.storedEnergy;
 		} else {
 			return 0;