diff --git a/src/app/layout/qgslayoutmapwidget.cpp b/src/app/layout/qgslayoutmapwidget.cpp
index 35a1c3c514a..2f654a4b17b 100644
--- a/src/app/layout/qgslayoutmapwidget.cpp
+++ b/src/app/layout/qgslayoutmapwidget.cpp
@@ -695,21 +695,18 @@ void QgsLayoutMapWidget::toggleAtlasScalingOptionsByLayerType()
     return;
   }
 
-  switch ( layer->wkbType() )
+  if ( QgsWkbTypes::geometryType( layer->wkbType() ) == QgsWkbTypes::PointGeometry )
   {
-    case QgsWkbTypes::Point:
-    case QgsWkbTypes::Point25D:
-    case QgsWkbTypes::MultiPoint:
-    case QgsWkbTypes::MultiPoint25D:
-      //For point layers buffer setting makes no sense, so set "fixed scale" on and disable margin control
-      mAtlasFixedScaleRadio->setChecked( true );
-      mAtlasMarginRadio->setEnabled( false );
-      mAtlasPredefinedScaleRadio->setEnabled( false );
-      break;
-    default:
-      //Not a point layer, so enable changes to fixed scale control
-      mAtlasMarginRadio->setEnabled( true );
-      mAtlasPredefinedScaleRadio->setEnabled( true );
+    //For point layers buffer setting makes no sense, so set "fixed scale" on and disable margin control
+    mAtlasFixedScaleRadio->setChecked( true );
+    mAtlasMarginRadio->setEnabled( false );
+    mAtlasPredefinedScaleRadio->setEnabled( false );
+  }
+  else
+  {
+    //Not a point layer, so enable changes to fixed scale control
+    mAtlasMarginRadio->setEnabled( true );
+    mAtlasPredefinedScaleRadio->setEnabled( true );
   }
 }
 
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
index 9f7e5ddfb57..0caf42ca7aa 100644
--- a/src/core/layout/qgslayoutitemmap.cpp
+++ b/src/core/layout/qgslayoutitemmap.cpp
@@ -1825,19 +1825,7 @@ void QgsLayoutItemMap::updateAtlasFeature()
   QgsRectangle originalExtent = mExtent;
 
   //sanity check - only allow fixed scale mode for point layers
-  bool isPointLayer = false;
-  switch ( mLayout->context().layer()->wkbType() )
-  {
-    case QgsWkbTypes::Point:
-    case QgsWkbTypes::Point25D:
-    case QgsWkbTypes::MultiPoint:
-    case QgsWkbTypes::MultiPoint25D:
-      isPointLayer = true;
-      break;
-    default:
-      isPointLayer = false;
-      break;
-  }
+  bool isPointLayer = QgsWkbTypes::geometryType( mLayout->context().layer()->wkbType() ) == QgsWkbTypes::PointGeometry;
 
   if ( mAtlasScalingMode == Fixed || mAtlasScalingMode == Predefined || isPointLayer )
   {