diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 38a7d9bd4..299fe0eca 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1888,6 +1888,7 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
 						case E_BLOCK_OBSIDIAN:
 						case E_BLOCK_BEACON:
 						case E_BLOCK_BEDROCK:
+						case E_BLOCK_BARRIER:
 						case E_BLOCK_WATER:
 						case E_BLOCK_LAVA:
 						{
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 878d309c9..52ea59884 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1153,6 +1153,11 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
 		Kick("You can't break a bedrock!");
 		return;
 	}
+	if (!m_Player->IsGameModeCreative() && (a_OldBlock == E_BLOCK_BARRIER))
+	{
+		Kick("You can't break a barrier!");
+		return;
+	}
 
 	cWorld * World = m_Player->GetWorld();
 	cItemHandler * ItemHandler = cItemHandler::GetItemHandler(m_Player->GetEquippedItem());